From 09f94fefc69d87ab20208032e5bffff0db6b21ef Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Feb 2010 15:05:39 -0700 Subject: [PATCH] openswan: Set USERLINK=${LDFLAGS} to fix GNU_HASH errors, bump PR --- recipes/openswan/openswan_2.2.0.bb | 3 ++- recipes/openswan/openswan_2.4.7.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb index bcf5a28756..9d3bf19bb8 100644 --- 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 28e599b282..a9cd2b3f7b 100644 --- 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} \ -- 2.39.2