summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Durnev <Mikhail_Durnev@mentor.com>2014-01-29 17:03:55 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-29 17:36:53 +0000
commit4f211322eb1179db62c03616b4c113114c612cf8 (patch)
treee125127ceaeb916cc8bf3e2a3a0b39654b4929ec
parent14e3a8f58e309121760fec70619633281dd9d88c (diff)
downloadopenembedded-core-4f211322eb1179db62c03616b4c113114c612cf8.tar.gz
openembedded-core-4f211322eb1179db62c03616b4c113114c612cf8.tar.bz2
openembedded-core-4f211322eb1179db62c03616b4c113114c612cf8.zip
unzip: Pass LDFLAGS to the linker
Change Makefile to use LDFLAGS Signed-off-by: Mikhail Durnev <Mikhail_Durnev@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/unzip/unzip/define-ldflags.patch18
-rw-r--r--meta/recipes-extended/unzip/unzip_6.0.bb5
2 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/meta/recipes-extended/unzip/unzip/define-ldflags.patch
new file mode 100644
index 0000000000..659c6e3315
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/define-ldflags.patch
@@ -0,0 +1,18 @@
+Pass LDFLAGS to the linker
+
+Upstream-Status: Pending
+
+Signed-off-by: Mikhail Durnev <Mikhail_Durnev@mentor.com>
+
+diff -Naur old/unix/configure new/unix/configure
+--- old/unix/configure 2014-01-13 21:59:27.000000000 +1100
++++ new/unix/configure 2014-01-14 16:36:02.000000000 +1100
+@@ -16,7 +16,7 @@
+ CFLAGSR=${CFLAGS}
+ IZ_BZIP2=${3}
+ CFLAGS="${CFLAGS} -I. -DUNIX"
+-LFLAGS1=""
++LFLAGS1=${LDFLAGS}
+ LFLAGS2=""
+ LN="ln -s"
+
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index 584802a598..33c20f8b4c 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -4,10 +4,11 @@ SECTION = "console/utils"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29"
PE = "1"
-PR = "r4"
+PR = "r5"
SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \
- file://avoid-strip.patch"
+ file://avoid-strip.patch \
+ file://define-ldflags.patch"
SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"