Merge lp:~peter-pearse/ubuntu/natty/ncurses/prop001 into lp:ubuntu/natty/ncurses

[Peter Pearse]

The test configure searches for the library containing certain functions e.g. tgoto.
As part of this it adds -L/lib. If a linker that fails on accessing incorrect binaries is used this causes the configuration to fail. One solution is to use a linker which does not fail on foreighn binaries. The correct solution is to ensure foreign binaries are not encountered.

[Steve Langasek (vorlon)]

This seems to conflict with the upstream intent, however, which is that -L/lib is needed on certain Linux distributions. If it's no longer needed then that part should definitely be fixed upstream.

Is it sufficient to *prepend* the cross-compilation path? i.e., have both
    CF_ADD_LIBDIR(/usr/$ac_cv_host_alias/lib)
and
    CF_ADD_LIBDIR(/lib)
?

I also don't think we should be adding this path except in cases where we know we're cross-compiling; can you please fix this to be conditional on host != build?

review: Needs Fixing

Unmerged revisions

34. By Peter Pearse on 2011-02-28

When cross building, qualify the library search directory used for linux.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-29 16:41:55 +0000
+++ debian/changelog	2011-02-28 14:21:21 +0000
@@ -1,3 +1,10 @@
+ncurses (5.7+20101128-1ubuntu1) natty; urgency=low
+
+  * When cross building, qualify the library search directory used for
+    linux
+
+ -- Peter Pearse <[e-mail]>  Mon, 28 Feb 2011 14:13:53 +0000
+
 ncurses (5.7+20101128-1) experimental; urgency=low
 
   [ Sven Joachim ]

=== added file 'debian/patches/10_cross.diff'
--- debian/patches/10_cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/10_cross.diff	2011-02-28 14:21:21 +0000
@@ -0,0 +1,29 @@
+diff -Nru nc/test/aclocal.m4 nc_p/test/aclocal.m4
+--- nc/test/aclocal.m4	2011-02-28 13:22:37.728333577 +0000
++++ nc_p/test/aclocal.m4	2011-02-28 13:52:28.718334986 +0000
+@@ -643,7 +643,7 @@
+         ])])
+     ;;
+ linux*) # Suse Linux does not follow /usr/lib convention
+-    CF_ADD_LIBDIR(/lib)
++    CF_ADD_LIBDIR(/usr/$ac_cv_host_alias/lib)
+     ;;
+ sunos3*|sunos4*)
+     if test -d /usr/5lib ; then
+diff -Nru nc/test/configure nc_p/test/configure
+--- nc/test/configure	2011-02-28 13:22:37.728333577 +0000
++++ nc_p/test/configure	2011-02-28 13:24:53.448335000 +0000
+@@ -5314,10 +5314,10 @@
+     ;;
+ linux*) # Suse Linux does not follow /usr/lib convention
+ 
+-if test -n "/lib" ; then
+-  for cf_add_libdir in /lib
++if test -n "/usr/$ac_cv_host_alias/lib" ; then
++  for cf_add_libdir in /usr/$ac_cv_host_alias/lib
+   do
+-    if test $cf_add_libdir = /usr/lib ; then
++    if test $cf_add_libdir = /usr/$ac_cv_host_alias/usr/lib ; then
+       :
+     elif test -d $cf_add_libdir
+     then

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-29 16:41:55 +0000
+++ debian/patches/series	2011-02-28 14:21:21 +0000
@@ -1,2 +1,3 @@
 02-debian-backspace.diff
 05-emdebian-wchar.diff
+10_cross.diff