Accepting request 86523 from home:uli_suse:branches:Base:System

- cross-build fix: use %__cc, %configure macros
- set bindir explicitly when installing
- (cross-?)build fix: disable build dependency on SELINUX_LIBS
  in libmount

OBS-URL: https://build.opensuse.org/request/show/86523
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=94

util-linux-2.20-libmount-deps.patch

@@ -0,0 +1,13 @@
+Index: util-linux-2.20/libmount/src/Makefile.am
+===================================================================
+--- util-linux-2.20.orig/libmount/src/Makefile.am
++++ util-linux-2.20/libmount/src/Makefile.am
+@@ -29,7 +29,7 @@ nodist_libmount_la_SOURCES = mountP.h
+ 
+ libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS)
+ 
+-libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) libmount.sym libmount.h.in
++libmount_la_DEPENDENCIES = $(ul_libblkid_la) libmount.sym libmount.h.in
+ 
+ libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \
+                       -version-info $(LIBMOUNT_VERSION_INFO)

util-linux.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  4 11:32:11 UTC 2011 - uli@suse.com
+
+- cross-build fix: use %__cc, %configure macros
+- set bindir explicitly when installing
+- (cross-?)build fix: disable build dependency on SELINUX_LIBS
+  in libmount
+
 -------------------------------------------------------------------
 Tue Sep 13 09:10:43 UTC 2011 - puzel@suse.com
 

util-linux.spec

@@ -88,6 +88,7 @@ Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 Patch2:         util-linux-2.17.1-mount_losetup_crypto.patch
 Patch3:         util-linux-sfdisk-manpage-fix.patch
 Patch4:         util-linux-lib-sysfs-deinit.patch
+Patch5:         util-linux-2.20-libmount-deps.patch
 
 ##
 ## adjtimex
@@ -191,6 +192,7 @@ Files to develop applications using the libmount library.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 #
 cd adjtimex-*
@@ -211,7 +213,7 @@ cd ../which-*
 %build
 # adjtimex build
 cd adjtimex-%{adjtimex_ver}
-CFLAGS="%{optflags}" ./configure
+%configure
 make %{?_smp_mflags}
 cd ..
 pushd ../
@@ -221,7 +223,7 @@ aclocal --force
 autoconf --force
 automake --force-missing --add-missing --foreign
 %{?suse_update_config:%{suse_update_config}}
-CFLAGS="%{optflags}" ./configure --prefix=/usr \
+%configure --prefix=/usr \
 				    --mandir=%{_mandir} \
 				    --infodir=%{_infodir} \
 				    %{_target_cpu}-suse-linux
@@ -230,8 +232,9 @@ cd ..
 # time build
 cd time-%{time_ver}
 %{?suse_update_config:%{suse_update_config}}
-CFLAGS="%{optflags} -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \
+export CFLAGS="%{optflags} -D_GNU_SOURCE "
-	./configure --prefix=/usr \
+export INSTALL_PROGRAM='$(INSTALL)'
+%configure --prefix=/usr \
 		    --mandir=%{_mandir} \
 		    --infodir=%{_infodir} \
 		    %{_target_cpu}-suse-linux
@@ -239,19 +242,18 @@ make %{?_smp_mflags}
 cd ..
 # klogconsole build
 cd klogconsole
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}"
 cd ..
 popd
 # setctsid build
 rm -f setctsid
-make %{?_smp_mflags} setctsid CFLAGS="%{optflags}"
+make %{?_smp_mflags} setctsid CFLAGS="%{optflags}" CC="%{__cc}"
 #
 # util-linux itself
 #
 autoreconf -fi
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie"
-CFLAGS="%{optflags}" \
 %configure \
   --bindir=/bin \
   --sbindir=/sbin \
@@ -269,13 +271,13 @@ CFLAGS="%{optflags}" \
   --disable-mountpoint \
   --disable-use-tty-group \
   --disable-static \
-  --disable-silent-rules
+  --disable-silent-rules --disable-rpath
 #
 make %{?_smp_mflags}
 #
-gcc %{optflags} -o nologin nologin.c
+%{__cc} %{optflags} -o nologin nologin.c
-gcc %{optflags} -o mkzimage_cmdline %{S:29}
+%{__cc} %{optflags} -o mkzimage_cmdline %{S:29}
-gcc %{optflags} -o chrp-addnote %{SOURCE31}
+%{__cc} %{optflags} -o chrp-addnote %{SOURCE31}
 
 %check
 cd ../time-%{time_ver}
@@ -305,7 +307,8 @@ mkdir -p %{buildroot}%{_defaultdocdir}/time
 make install DESTDIR=%{buildroot} \
         prefix=%{buildroot}/usr \
         infodir=%{buildroot}%{_infodir} \
-        mandir=%{buildroot}%{_mandir}
+        mandir=%{buildroot}%{_mandir} \
+        bindir=%{buildroot}%{_bindir}
 install -m 0644 README    %{buildroot}%{_defaultdocdir}/time/
 install -m 0644 AUTHORS   %{buildroot}%{_defaultdocdir}/time/
 install -m 0644 COPYING   %{buildroot}%{_defaultdocdir}/time/