Skip to contentSkip to conversation

openswan: add missing TARGET_MAKE_ENV

PATCH New Thomas Petazzoni 2 participants 2 messages Mar 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openswan: add missing TARGET_MAKE_ENV

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.

---
 package/openswan/openswan.mk |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
package/openswan/openswan.mk +7 -2
index 781dc00..153d659 100644
@@ -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))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 openswan: add missing TARGET_MAKE_ENV

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard