Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

1 files changed, 35 insertions, 0 deletions

diff --git a/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch b/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
new file mode 100644
index 0000000000..35d3860215
--- /dev/null
+++ b/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
@@ -0,0 +1,35 @@
+From 5c58b8737dc9ccf9407f6725f6f07b764d6abb22 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 22 Jan 2015 23:47:55 +0100
+Subject: [PATCH 4/6] configure: use LDFLAGS from command line
+
+The bzip2 support may not enabled due to a build error
+during the checking for bzip2 library.
+The library path (-L) to bzip2 library is missing.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ unix/configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unix/configure b/unix/configure
+index 489009f..de9fd68 100644
+--- a/unix/configure
++++ b/unix/configure
+@@ -106,11 +106,11 @@ int main()
+   return 0;
+ }
+ _EOF_
+-      $CC $CFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null
++      $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null
+       if test $? -eq 0; then
+         echo "-- OS supports bzip2 - linking in bzip2"
+         CFLAGS="${CFLAGS} -DBZIP2_SUPPORT"
+-        LFLAGS2="${LFLAGS2} -lbz2"
++        LFLAGS2="${LFLAGS2} ${LDFLAGS} -lbz2"
+       else
+         echo "-- Either bzlib.h or libbz2.a not found - no bzip2"
+       fi
+-- 
+1.9.3
+