diff --git a/util-linux.changes b/util-linux.changes index c3c9741..fcab688 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 4 17:06:47 CEST 2007 - pth@suse.de + +- Make configure of which search for static libs in lib64 subdirs. + ------------------------------------------------------------------- Mon Apr 23 16:49:00 CEST 2007 - mkoenig@suse.de diff --git a/util-linux.spec b/util-linux.spec index 3b96220..fce20bd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -21,7 +21,7 @@ License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on Version: 2.12r+git20070412 -Release: 1 +Release: 13 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 Source2: nologin.c @@ -140,6 +140,10 @@ Patch56: klogconsole.diff ## time ## Patch60: time-1.7.dif +## +## which +## +Patch70: which-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -152,7 +156,7 @@ mount program, the fdisk configuration tool, and more. Authors: -------- - Adrian Bunk + Karel Zak %prep %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -b 24 -n %name-ng-%version @@ -210,6 +214,8 @@ cd ../klogconsole %patch56 -p1 cd ../time-* %patch60 +cd ../which-* +%patch70 %build # adjtimex build @@ -610,6 +616,8 @@ fi %endif %changelog +* Mon Jun 04 2007 - pth@suse.de +- Make configure of which search for static libs in lib64 subdirs. * Mon Apr 23 2007 - mkoenig@suse.de - update to git20070412 - remove chkdupexe and scriptreplay to get rid of the diff --git a/which-lib64.patch b/which-lib64.patch new file mode 100644 index 0000000..6c3bf2f --- /dev/null +++ b/which-lib64.patch @@ -0,0 +1,18 @@ +--- acinclude.m4 ++++ acinclude.m4 +@@ -10,10 +10,13 @@ + dnl may have different results. + ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` + AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var, ++if test ! -z `grep 64 $libdir; then ++ libsuffix=64 ++fi + if test -r /etc/ld.so.conf ; then +- ld_so_paths="/lib /usr/lib `cat /etc/ld.so.conf`" ++ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix} `cat /etc/ld.so.conf`" + else +- ld_so_paths="/lib /usr/lib" ++ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix}" + fi + for path in $ld_so_paths; do + [ac_save_LIBS="$LIBS"