From ffcf8f4ea2378030f3fcacbdae090d7655662730 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 29 Aug 2014 11:51:54 +0200 Subject: [PATCH] testing: Make strongSwan build recipe more configurable --- testing/scripts/recipes/013_strongswan.mk | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk index c4142086f2..3501b74536 100644 --- a/testing/scripts/recipes/013_strongswan.mk +++ b/testing/scripts/recipes/013_strongswan.mk @@ -5,6 +5,15 @@ PKG = strongswan-$(PV) TAR = $(PKG).tar.bz2 SRC = http://download.strongswan.org/$(TAR) +# can be passed to load sources from a directory instead of a tarball +ifneq ($(origin SRCDIR), undefined) +DIR = $(SRCDIR) +BUILDDIR ?= $(SRCDIR) +endif +DIR ?= . +# can be passed if not building in the source directory +BUILDDIR ?= $(PKG) + NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN) CONFIG_OPTS = \ @@ -94,11 +103,11 @@ $(TAR): $(PKG): $(TAR) tar xfj $(TAR) -configure: $(PKG) - cd $(PKG) && ./configure $(CONFIG_OPTS) +configure: $(BUILDDIR) + cd $(BUILDDIR) && $(DIR)/configure $(CONFIG_OPTS) build: configure - cd $(PKG) && make -j $(NUM_CPUS) + cd $(BUILDDIR) && make -j $(NUM_CPUS) install: build - cd $(PKG) && make install + cd $(BUILDDIR) && make install -- 2.47.2