SPECS: glibc.spec - use _autostripdebug for ld and libpthread - sa...

[qboosh]

Author: qboosh                       Date: Sun Jan  6 14:38:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _autostripdebug for ld and libpthread
- sanity check before replacing symlinks with absolute ones

---- Files affected:
SPECS:
   glibc.spec (1.744 -> 1.745) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.744 SPECS/glibc.spec:1.745
--- SPECS/glibc.spec:1.744	Sun Jan  6 14:56:10 2008
+++ SPECS/glibc.spec	Sun Jan  6 15:38:35 2008
@@ -102,7 +102,7 @@
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.396
+BuildRequires:	rpmbuild(macros) >= 1.411
 BuildRequires:	sed >= 4.0.5
 BuildRequires:	texinfo
 Requires(post):	ldconfig = %{epoch}:%{version}-%{release}
@@ -134,6 +134,11 @@
 %define		filterout_ld		(-Wl,)?-[sS] (-Wl,)?--strip.*
 %define 	specflags_sparc64	-mcpu=ultrasparc -mvis -fcall-used-g6
 
+# ld.so needs not to be stripped to work
+# gdb needs unstripped libpthread for some threading support
+# ...but we can strip at least debuginfo from them
+%define		_autostripdebug		.*/ld-[0-9.]*so\|.*/libpthread-[0-9.]*so
+
 # -m from CFLAGS or even LDFLAGS is not propagated to some *.o linking
 %ifarch sparc sparcv9
 %{expand:%%define	__cc	%{__cc} -m32}
@@ -1001,18 +1006,22 @@
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so $RPM_BUILD_ROOT%{_libdir}}
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
 # moved to tzdata package
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 
 ln -sf libbsd-compat.a		$RPM_BUILD_ROOT%{_libdir}/libbsd.a
 
 # make symlinks across top-level directories absolute
 for l in anl BrokenLocale crypt dl m nsl resolv rt thread_db util ; do
+	test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
 	rm -f $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
-	ln -sf /%{_lib}/`cd $RPM_BUILD_ROOT/%{_lib} ; echo lib${l}.so.*` $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
+	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
 done
 
+# linking nss modules directly is not supported
+rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
+
 install %{SOURCE2}		$RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
 install %{SOURCE3}		$RPM_BUILD_ROOT/etc/sysconfig/nscd
 install %{SOURCE4}		$RPM_BUILD_ROOT/etc/logrotate.d/nscd
@@ -1039,11 +1048,6 @@
 done
 cp -f crypt/README.ufc-crypt ChangeLog* documentation
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
-
-# strip ld.so with --strip-debug only (other ELFs are stripped by rpm):
-%{!?debug:strip -g -R .comment -R .note $RPM_BUILD_ROOT/%{_lib}/ld-*.so}
-
 # Collect locale files and mark them with %%lang()
 rm -f glibc.lang
 echo '%defattr(644,root,root,755)' > glibc.lang
@@ -1542,6 +1546,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.745  2008-01-06 14:38:35  qboosh
+- use _autostripdebug for ld and libpthread
+- sanity check before replacing symlinks with absolute ones
+
 Revision 1.744  2008-01-06 13:56:10  qboosh
 - cleaned up and simplified lang()ed files generation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.744&r2=1.745&f=u