Author: qboosh Date: Sun Feb 20 00:58:17 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged sparc64 updates from AC-branch (enhanced for ppc64,s390x)
---- Files affected:
SPECS:
glibc.spec (1.576 -> 1.577)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.576 SPECS/glibc.spec:1.577
--- SPECS/glibc.spec:1.576 Sun Feb 20 01:31:18 2005
+++ SPECS/glibc.spec Sun Feb 20 01:58:11 2005
@@ -16,7 +16,7 @@
%bcond_with tests # perform "make test"
%bcond_with tests_nptl # perform NPTL tests on dual build (requires
2.6.x kernel)
%bcond_without localedb # don't build localedb-all (is time consuming)
-
+%bcond_with cross # build using crossgcc (without libgcc_eh)
#
# TODO:
# - look at locale fixes/updates in bugzilla
@@ -38,13 +38,14 @@
%if %{with tls}
# sparc temporarily removed (broken)
-%ifnarch %{ix86} amd64 ia64 alpha s390 s390x sparc64 sparcv9 ppc ppc64
+%ifnarch %{ix86} amd64 ia64 alpha s390 s390x sparc64 sparcv9 ppc ppc64
%undefine with_tls
%endif
%endif
%if %{with nptl}
-# nptl on x86 uses cmpxchgl (available since i486)
+# on x86 uses cmpxchgl (available since i486)
+# on sparc only sparcv9 is supported
%ifnarch i486 i586 i686 pentium3 pentium4 athlon amd64 ia64 alpha s390 s390x
sparc64 sparcv9 ppc ppc64
%undefine with_nptl
%else
@@ -122,9 +123,10 @@
Patch26: %{name}-nscd.patch
Patch27: %{name}-nscd-user.patch
Patch28: %{name}-gcc4.patch
+Patch29: %{name}-cross-gcc_eh.patch
# PaX hacks (dropped)
-#Patch29: %{name}-pax_iconvconfig.patch
-#Patch30: %{name}-pax_dl-execstack.patch
+#Patch30: %{name}-pax_iconvconfig.patch
+#Patch31: %{name}-pax_dl-execstack.patch
URL: http://www.gnu.org/software/libc/
BuildRequires: automake
BuildRequires: binutils >= 2:2.15.90.0.3
@@ -164,10 +166,7 @@
%define debugcflags -O1 -g
# avoid -s here (ld.so must not be stripped to allow any program debugging)
%define rpmldflags %{nil}
-%ifarch sparc64
-%define specflags_sparc64 -mvis -fcall-used-g6
-%define _libdir /usr/lib64
-%endif
+%define specflags_sparc64 -mcpu=ultrasparc -mvis -fcall-used-g6
# we don't want perl dependency in glibc-devel
%define _noautoreqfiles %{_bindir}/mtrace
# hack: don't depend on rpmlib(PartialHardlinkSets) for easier upgrade from Ra
@@ -735,7 +734,7 @@
Summary(es): GNU libc - bibliotecas de 64 bits
Summary(pl): GNU libc - biblioteki 64-bitowe
Group: Libraries
-%ifarch amd64
+%ifarch amd64 ppc64 s390x sparc64
Provides: glibc = %{epoch}:%{version}-%{release}
Requires: glibc-misc = %{epoch}:%{version}-%{release}
%else
@@ -818,6 +817,7 @@
%patch26 -p1
%patch27 -p1
%patch28 -p1
+%{?with_cross:%patch29 -p1}
chmod +x scripts/cpp
@@ -833,6 +833,9 @@
rm -rf builddir
install -d builddir
cd builddir
+%ifarch sparc64
+CC="%{__cc} -m64 -mcpu=ultrasparc -mvis -fcall-used-g6"
+%endif
%if %{with linuxthreads}
../%configure \
--enable-kernel="%{min_kernel}" \
@@ -952,9 +955,7 @@
%endif
%{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so
$RPM_BUILD_ROOT%{_libdir}}
-%ifnarch sparc64
mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so $RPM_BUILD_ROOT%{_libdir}
-%endif
%if %{with linuxthreads}
install linuxthreads/man/*.3thr $RPM_BUILD_ROOT%{_mandir}/man3
@@ -1015,9 +1016,7 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
# strip ld.so with --strip-debug only (other ELFs are stripped by rpm):
-%ifnarch sparc64
%{!?debug:strip -g -R .comment -R .note $RPM_BUILD_ROOT/%{_lib}/ld-*.so}
-%endif
# Collect locale files and mark them with %%lang()
rm -f glibc.lang
@@ -1083,8 +1082,7 @@
# don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
# when %%postun is run
-%ifnarch sparc64
-%ifarch amd64
+%ifarch amd64 ppc64 s390x sparc64
%post -n %{name}64 -p /sbin/postshell
%else
%post -p /sbin/postshell
@@ -1092,7 +1090,7 @@
/sbin/ldconfig
-/sbin/telinit u
-%ifarch amd64
+%ifarch amd64 ppc64 s390x sparc64
%postun -n %{name}64 -p /sbin/postshell
%else
%postun -p /sbin/postshell
@@ -1100,7 +1098,7 @@
/sbin/ldconfig
-/sbin/telinit u
-%ifarch amd64
+%ifarch amd64 ppc64 s390x sparc64
%triggerpostun -n %{name}64 -p /sbin/postshell -- glibc-misc <
6:2.3.4-0.20040505.1
%else
%triggerpostun -p /sbin/postshell -- glibc-misc < 6:2.3.4-0.20040505.1
@@ -1137,10 +1135,8 @@
fi
/sbin/chkconfig --del nscd
fi
-%endif
-%ifnarch sparc64
-%ifarch amd64
+%ifarch amd64 ppc64 s390x sparc64
%files -n glibc64
%defattr(644,root,root,755)
%else
@@ -1192,7 +1188,7 @@
%attr(755,root,root) %{_bindir}/getent
%attr(755,root,root) %{_bindir}/iconv
%attr(755,root,root) %{_bindir}/ldd
-%ifnarch alpha amd64 ia64 ppc sparc64
+%ifarch %{ix86} m68k sparc sparcv9
%attr(755,root,root) %{_bindir}/lddlibc4
%endif
%attr(755,root,root) %{_bindir}/locale
@@ -1475,53 +1471,15 @@
%{_libdir}/soinit.o
%{_libdir}/sofini.o
-%else
-
-%files -n glibc64
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ld-*
-%attr(755,root,root) %{_libdir}/libanl*
-%attr(755,root,root) %{_libdir}/libdl*
-%attr(755,root,root) %{_libdir}/libnsl*
-%attr(755,root,root) %{_libdir}/lib[BScmprtu]*
-%attr(755,root,root) %{_libdir}/libnss_dns*.so*
-%attr(755,root,root) %{_libdir}/libnss_files*.so*
-
-%files -n glibc64-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib[!m]*.so
-%attr(755,root,root) %{_libdir}/libm.so
-%attr(755,root,root) %{_libdir}/*crt*.o
-%{_libdir}/libbsd-compat.a
-%{_libdir}/libbsd.a
-%{_libdir}/libc_nonshared.a
-%{_libdir}/libg.a
-%{_libdir}/libieee.a
-%{_libdir}/libpthread_nonshared.a
-%{_libdir}/librpcsvc.a
-
-%files -n glibc64-static
-%defattr(644,root,root,755)
-%{_libdir}/libanl.a
-%{_libdir}/libBrokenLocale.a
-%{_libdir}/libc.a
-%{_libdir}/libcrypt.a
-%{_libdir}/libdl.a
-%{_libdir}/libm.a
-%{_libdir}/libmcheck.a
-%{_libdir}/libnsl.a
-%{_libdir}/libpthread.a
-%{_libdir}/libresolv.a
-%{_libdir}/librt.a
-%{_libdir}/libutil.a
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.577 2005/02/20 00:58:11 qboosh
+- merged sparc64 updates from AC-branch (enhanced for ppc64,s390x)
+
Revision 1.576 2005/02/20 00:31:18 qboosh
- merged nscd-user patch from AC-branch (run nscd as nscd user)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.576&r2=1.577&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
