From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 8 Mar 2014 00:56:42 +0000 (+0000)
Subject: dialog: fix configure test against ncurses
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=632b8c1325f905005af03673e15828271d66fad8;p=packages.git

dialog: fix configure test against ncurses

When building on x86_64 hosts, the configure script will try to add /lib64 from
the host to the linker command, which will usually result in failing the
ncurses library test, fix this by checking whether we are cross-compiling or
not.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@39802 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/dialog/Makefile b/utils/dialog/Makefile
index 872ab835a..8c4737a40 100644
--- a/utils/dialog/Makefile
+++ b/utils/dialog/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dialog
 PKG_VERSION:=1.1-20120706
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://invisible-island.net/dialog
diff --git a/utils/dialog/patches/001-cross_compile.patch b/utils/dialog/patches/001-cross_compile.patch
new file mode 100644
index 000000000..f2f079fc4
--- /dev/null
+++ b/utils/dialog/patches/001-cross_compile.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -11827,7 +11827,7 @@ linux*)
+ 		if test -d /lib64
+ 		then
+ 
+-if test -n "/lib64" ; then
++if test -n "/lib64" -a test $cross_compiling = "no"; then
+   for cf_add_libdir in /lib64
+   do
+     if test $cf_add_libdir = /usr/lib ; then