sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=15

Browse Source
This commit is contained in:
OBS User unknown 2007-06-05 14:42:12 +00:00 committed by Git OBS Bridge
parent 1003377f4f
commit ecc1694e71
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util-linux.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jun 5 14:34:49 CEST 2007 - pth@suse.de
- Update to which-2.16, mainly because regenerating configure
with newer autotools works.
- Fix the patch for AC_CHECK_STATICLIB
- Our distribution doesn't install libiberty.a, so pass
--disable-iberty to configure of which to not use a libiberty from
somewhere else.
-------------------------------------------------------------------
Mon Jun 4 17:06:47 CEST 2007 - pth@suse.de

14
util-linux.spec
View File

@ -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: 13
Release: 14
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
@ -30,7 +30,7 @@ Source4: raw.init
Source5: etc.raw
Source6: etc_filesystems
%define time_ver 1.7
%define which_ver 2.13
%define which_ver 2.16
%define adjtimex_ver 1.20
Source9: adjtimex-%{adjtimex_ver}.tar.bz2
Source10: freeramdisk.tar.bz2
@ -216,6 +216,7 @@ cd ../time-*
%patch60
cd ../which-*
%patch70
autoreconf -fi
%build
# adjtimex build
@ -234,6 +235,8 @@ cd which-%{which_ver}
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--disable-iberty \
%{_target_cpu}-suse-linux
make
cd ..
@ -616,6 +619,13 @@ fi
%endif
%changelog
* Tue Jun 05 2007 - pth@suse.de
- Update to which-2.16, mainly because regenerating configure
with newer autotools works.
- Fix the patch for AC_CHECK_STATICLIB
- Our distribution doesn't install libiberty.a, so pass
--disable-iberty to configure of which to not use a libiberty from
somewhere else.
* 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

3
which-2.13.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6763cd994fcc825dbd420495af5b9e16f455a353ebbd15f502a49943c581045
size 106270

3
which-2.16.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ac8502e9985a3ac6b0e2aa4f2a60f91cad0dc0cca6dc9c1c142ebba4b8dd664
size 125696

17
which-lib64.patch
View File

@ -1,11 +1,22 @@
--- acinclude.m4
+++ acinclude.m4
@@ -10,10 +10,13 @@
@@ -3,7 +3,7 @@
dnl Like AC_CHECK_LIB but looking for static libraries.
dnl LIBRARY must be of the form libxxx.a.
dnl The current language must be C (AC_LANG_C).
-AC_DEFUN(AC_CHECK_STATICLIB,
+AC_DEFUN([AC_CHECK_STATICLIB],
[AC_MSG_CHECKING([for $2 in $1])
dnl Use a cache variable name containing both the library and function name,
dnl because the test really is for library $1 defining function $2, not
@@ -11,10 +11,15 @@
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
+if test "$libdir" != "${exec_prefix}/lib"; then
+ if test ! -z `grep 64 $libdir`&& test ; then
+ libsuffix=64
+ fi
+fi
if test -r /etc/ld.so.conf ; then
- ld_so_paths="/lib /usr/lib `cat /etc/ld.so.conf`"