openswan: Set USERLINK=${LDFLAGS} to fix GNU_HASH errors, bump PR

diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb
index bcf5a28756a84cfa43d68fff536e0e175dccc81b..9d3bf19bb89b96d423857941b9dd393f6af90484 100644 (file)
--- a/recipes/openswan/openswan_2.2.0.bb
+++ b/recipes/openswan/openswan_2.2.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_append_nylon = "perl"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
           file://openswan-2.2.0-gentoo.patch;patch=1 \
@@ -19,6 +19,7 @@ S = "${WORKDIR}/openswan-${PV}"
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "DESTDIR=${D} \
                 USERCOMPILE="${CFLAGS}" \
+                USERLINK="${LDFLAGS}" \
                 FINALCONFDIR=${sysconfdir}/ipsec \
                 INC_RCDEFAULT=${sysconfdir}/init.d \
                 INC_USRLOCAL=${prefix} \

diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb
index 28e599b282e5d3475bf5f0f8e029cd82c9f6e0b0..a9cd2b3f7bae551d47189c453633a004cb1f1a1e 100644 (file)
--- a/recipes/openswan/openswan_2.4.7.bb
+++ b/recipes/openswan/openswan_2.4.7.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_append_nylon = "perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
           file://openswan-2.4.7-gentoo.patch;patch=1 \
@@ -17,6 +17,7 @@ S = "${WORKDIR}/openswan-${PV}"
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "DESTDIR=${D} \
                 USERCOMPILE="${CFLAGS}" \
+                USERLINK="${LDFLAGS}" \
                 FINALCONFDIR=${sysconfdir}/ipsec \
                 INC_RCDEFAULT=${sysconfdir}/init.d \
                 INC_USRLOCAL=${prefix} \