auto-import glibc-2.2.4-19 from glibc-2.2.4-19.src.rpm

This commit is contained in:
cvsdist 2004-09-09 05:21:12 +00:00
parent c6011023af
commit 2704fae76d

View File

@ -1,4 +1,4 @@
%define glibcrelease 18.7.0.2 %define glibcrelease 19
%define auxarches i586 i686 athlon sparcv9 alphaev6 %define auxarches i586 i686 athlon sparcv9 alphaev6
Summary: The GNU libc libraries. Summary: The GNU libc libraries.
Name: glibc Name: glibc
@ -38,15 +38,19 @@ BuildPreReq: gcc >= 2.96-82
Conflicts: rpm <= 4.0-0.65 Conflicts: rpm <= 4.0-0.65
Conflicts: glibc-devel < 2.2.3 Conflicts: glibc-devel < 2.2.3
Patch: glibc-kernel-2.4.patch Patch: glibc-kernel-2.4.patch
Patch2: glibc-2.2.4.patch
%ifarch ia64 sparc64 s390x %ifarch ia64 sparc64 s390x
Conflicts: kernel < 2.4.0 Conflicts: kernel < 2.4.0
%define enablekernel 2.4.0 %define enablekernel 2.4.0
%define enablemask [01].*|2.[0-3]* %define enablemask [01].*|2.[0-3]*
%else %else
%define enablekernel 2.2.5 %define enablekernel 2.2.5
%ifarch i686
%define enablekernel2 2.4.1
%define enablemask [01].*|2.[0-3]*|2.4.0*
%else
%define enablemask [01].*|2.[0-1]*|2.2.[0-4]|2.2.[0-4][^0-9]* %define enablemask [01].*|2.[0-1]*|2.2.[0-4]|2.2.[0-4][^0-9]*
%endif %endif
%endif
%define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh %define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh
%description %description
@ -135,7 +139,6 @@ case `uname -r` in
%enablemask) %enablemask)
%patch -p1 %patch -p1
;; esac ;; esac
%patch2 -p1
%ifarch armv4l sparc64 ia64 s390 s390x %ifarch armv4l sparc64 ia64 s390 s390x
rm -rf glibc-compat rm -rf glibc-compat
@ -215,6 +218,35 @@ cd build-%{_target_cpu}-linux && \
cd .. cd ..
%endif %endif
%ifarch i686
rm -rf build-%{_target_cpu}-linux2.4
mkdir build-%{_target_cpu}-linux2.4 ; cd build-%{_target_cpu}-linux2.4
GCC=gcc
BuildFlags=`cat ../BuildFlags`
EnableKernel="--enable-kernel=%{enablekernel2} --disable-profile"
CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \
--enable-add-ons=yes --without-cvs $EnableKernel \
%{_target_cpu}-redhat-linux
if [ -x /usr/bin/getconf ] ; then
numprocs=$(/usr/bin/getconf _NPROCESSORS_ONLN)
if [ $numprocs -eq 0 ]; then
numprocs=1
fi
else
numprocs=1
fi
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
mkdir -p $RPM_BUILD_ROOT/lib/%{_target_cpu}/
cp -a libc.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libc-*.so`
ln -sf `basename $RPM_BUILD_ROOT/lib/libc-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libc.so.*`
cp -a math/libm.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libm-*.so`
ln -sf `basename $RPM_BUILD_ROOT/lib/libm-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libm.so.*`
cp -a linuxthreads/libpthread.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libpthread-*.so`
ln -sf `basename $RPM_BUILD_ROOT/lib/libpthread-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libpthread.so.*`
strip -R .comment $RPM_BUILD_ROOT/lib/{libc,libm,libpthread}-*.so
cd ..
%endif
# compatibility hack: this locale has vanished from glibc, but some other # compatibility hack: this locale has vanished from glibc, but some other
# programs are still using it. Normally we would handle it in the %pre # programs are still using it. Normally we would handle it in the %pre
# section but with glibc that is simply not an option # section but with glibc that is simply not an option
@ -418,6 +450,9 @@ rm -f *.filelist*
%files -f rpm.filelist %files -f rpm.filelist
%defattr(-,root,root) %defattr(-,root,root)
%ifarch i686
%dir /lib/i686
%endif
%verify(not md5 size mtime) %config(noreplace) /etc/localtime %verify(not md5 size mtime) %config(noreplace) /etc/localtime
%verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf %verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf
%verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf
@ -444,21 +479,7 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Dec 4 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-18.7.0.2 * Wed Oct 3 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-19
- fix glob buffer overflow
* Wed Nov 28 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-18.7.0.1
- add selected changes from CVS
- handle DT_RUNPATH properly (#55865)
- fix *scanf nan/inf handling
- fix strndup
- fix fnmatch - handling at end of bracket expr
- allow dlfcn.h to be used in C++
- fix IPv6 reverse lookups
- avoid SPARC warnings in bits/mathinline.h
* Wed Oct 3 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-18.7.0
- special rpm for 7.0 without 2.4.1+ kernel requirements on i686
- fix strsep - fix strsep
* Fri Sep 28 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-18 * Fri Sep 28 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-18