metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

auto-import glibc-2.2.5-36 from glibc-2.2.5-36.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 05:28:20 +00:00
parent a76a167f16
commit 2e3cbbc31c
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
glibc-2.2.5.tar.bz2 glibc-2.2.5.tar.bz2
prelink-20020326.tar.bz2 prelink-20020617.tar.bz2

25
glibc.spec
View File

@ -1,7 +1,7 @@
%define glibcrelease 34.1 %define glibcrelease 36
%define auxarches i586 i686 athlon sparcv9 alphaev6 %define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches i686 athlon alpha alphaev6 %define prelinkarches i686 athlon alpha alphaev6
%define prelinkdate 20020326 %define prelinkdate 20020617
Summary: The GNU libc libraries. Summary: The GNU libc libraries.
Name: glibc Name: glibc
Version: 2.2.5 Version: 2.2.5
@ -28,11 +28,11 @@ BuildPreReq: gd-devel libpng-devel zlib-devel
BuildPreReq: libelf >= 0.7.0-2 BuildPreReq: libelf >= 0.7.0-2
# This is to ensure that __frame_state_for exported by glibc # This is to ensure that __frame_state_for exported by glibc
# will be compatible with egcs 1.x.y # will be compatible with egcs 1.x.y
BuildPreReq: gcc >= 2.96-84
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
Patch1: glibc-2.2.4-s390-2.patch Patch2: glibc-2.2.5.patch
Patch2: glibc-2.2.4-s390-3.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
@ -185,7 +185,6 @@ case `uname -r` in
%enablemask) %enablemask)
%patch -p1 %patch -p1
;; esac ;; esac
%patch1 -p1
%patch2 -p1 %patch2 -p1
%ifarch %{prelinkarches} %ifarch %{prelinkarches}
@ -309,7 +308,7 @@ cd ..
%ifarch %{prelinkarches} %ifarch %{prelinkarches}
# Build prelink # Build prelink
cd prelink/prelink-%{prelinkdate} cd prelink/prelink
%configure %configure
make make
cd ../.. cd ../..
@ -429,9 +428,9 @@ cd prelink
> prelink.conf > prelink.conf
# For now disable prelinking of ld.so, as it breaks statically linked # For now disable prelinking of ld.so, as it breaks statically linked
# binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag) # binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag)
# prelink-%{prelinkdate}/src/prelink -c ./prelink.conf -C ./prelink.cache \ # prelink/src/prelink -c ./prelink.conf -C ./prelink.cache \
# --mmap-region-start=0x40000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so # --mmap-region-start=0x40000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so
prelink-%{prelinkdate}/src/prelink --reloc-only=0x42000000 \ prelink/src/prelink --reloc-only=0x42000000 \
$RPM_BUILD_ROOT/%{_lib}/i686/libc-*.so $RPM_BUILD_ROOT/%{_lib}/i686/libc-*.so
cd .. cd ..
%endif %endif
@ -441,9 +440,9 @@ cd prelink
> prelink.conf > prelink.conf
# For now disable prelinking of ld.so, as it breaks statically linked # For now disable prelinking of ld.so, as it breaks statically linked
# binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag) # binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag)
# prelink-%{prelinkdate}/src/prelink -c ./prelink.conf -C ./prelink.cache \ # prelink/src/prelink -c ./prelink.conf -C ./prelink.cache \
# --mmap-region-start=0x0000020000000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so # --mmap-region-start=0x0000020000000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so
prelink-%{prelinkdate}/src/prelink --reloc-only=0x0000020010000000 \ prelink/src/prelink --reloc-only=0x0000020010000000 \
$RPM_BUILD_ROOT/%{_lib}/libc-*.so $RPM_BUILD_ROOT/%{_lib}/libc-*.so
cd .. cd ..
%endif %endif
@ -655,6 +654,12 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Jun 18 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-35
- fix nice return value
- fix __moddi3 (#65612, #65695)
- export get*ent_r@@GLIBC_2.1.2 symbols (#66278)
- update prelink to fix prelink -r on alpha
* Mon Apr 15 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-34 * Mon Apr 15 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-34
- add relocation dependencies even for weak symbols (#63422) - add relocation dependencies even for weak symbols (#63422)
- stricter check_fds check for suid/sgid binaries - stricter check_fds check for suid/sgid binaries

2
sources
View File

@ -1,2 +1,2 @@
5f2c374a3a98e349e074f4ded6f007ba glibc-2.2.5.tar.bz2 5f2c374a3a98e349e074f4ded6f007ba glibc-2.2.5.tar.bz2
c44995bb021692b62c250fee1c9a19b2 prelink-20020326.tar.bz2 11f194948cbbd8be9bd5e1b97a11c51e prelink-20020617.tar.bz2