Patchwork openswan: add missing TARGET_MAKE_ENV

login
register
mail settings
Submitter Thomas Petazzoni
Date March 25, 2013, 7:51 a.m.
Message ID <1364197915-10874-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/230584/
State Accepted
Commit cdae2b24f01281c830ac74bc3818fa1773a59ea8
Headers show

Comments

Thomas Petazzoni - March 25, 2013, 7:51 a.m.
openswan needs host-bison. The dependency was already there, but the
build was not executed with $(TARGET_MAKE_ENV) in the environment, and
therefore $(HOST_DIR)/usr/bin was not in the PATH.

While we're at it, add licensing informations to openswan.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/openswan/openswan.mk |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Peter Korsgaard - March 25, 2013, 7:57 a.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> openswan needs host-bison. The dependency was already there, but the
 Thomas> build was not executed with $(TARGET_MAKE_ENV) in the environment, and
 Thomas> therefore $(HOST_DIR)/usr/bin was not in the PATH.

 Thomas> While we're at it, add licensing informations to openswan.

Committed, thanks.

Patch

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 781dc00..153d659 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -6,6 +6,9 @@ 
 
 OPENSWAN_VERSION = 2.6.38
 OPENSWAN_SITE = http://download.openswan.org/openswan
+OPENSWAN_LICENSE = GPLv2+, BSD-3c
+OPENSWAN_LICENSE_FILES = COPYING LICENSE
+
 OPENSWAN_DEPENDENCIES = host-bison gmp iproute2
 OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
 	USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \
@@ -25,11 +28,13 @@  endif
 endif
 
 define OPENSWAN_BUILD_CMDS
-	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) programs
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(OPENSWAN_MAKE_OPT) programs
 endef
 
 define OPENSWAN_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))