diff options
| -rw-r--r-- | fedora/glibc.spec.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index c7eb9e8db0..6288bd6c3a 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,5 +1,5 @@ %define run_glibc_tests 1 -%define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 +%define auxarches i686 athlon sparcv9v sparc64v alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} %define buildxen 1 @@ -53,7 +53,7 @@ BuildRequires: /bin/ps, /bin/kill, /bin/awk # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y BuildRequires: gcc >= 3.2 -%define enablekernel 2.6.9 +%define enablekernel 2.6.18 %ifarch i386 %define nptl_target_cpu i486 %else @@ -599,10 +599,10 @@ grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full | egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ - | grep -v '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + | grep '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ - | grep '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + | grep -v '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ > static.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist @@ -747,6 +747,13 @@ echo ====================PLT RELOCS END================== %endif +pushd $RPM_BUILD_ROOT/usr/%{_lib}/ +$GCC -Wl,-r -o libpthread.o -Wl,--whole-archive ./libpthread.a +rm libpthread.a +ar rcs libpthread.a libpthread.o +rm libpthread.o +popd + %if "%{_enable_debug_packages}" == "1" # The #line directives gperf generates do not give the proper @@ -1006,6 +1013,9 @@ rm -f *.filelist* - update from trunk - adjust for i586 + i686 from i386 + i686 build - split static libraries into glibc-static subpackage +- ld -r the whole libpthread.a together to avoid endless issues with + -static ... -lpthread +- require 2.6.18 and later kernel * Wed Feb 4 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-3 - update from trunk |