diff options
Diffstat (limited to 'fedora/glibc.spec.in')
| -rw-r--r-- | fedora/glibc.spec.in | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 7a3c5f2a0e..d0692de3e7 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 25 +%define glibcrelease 26 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -56,8 +56,8 @@ Conflicts: gcc4 <= 4.0.0-0.6 # /etc/default Conflicts: shadow-utils < 2:4.0.3-20 Conflicts: nscd < 2.3.3-52 -Conflicts: kernel < 2.4.20 -%define enablekernel 2.4.20 +Conflicts: kernel < 2.6.9 +%define enablekernel 2.6.9 %ifarch i386 %define nptl_target_cpu i486 %else @@ -477,6 +477,7 @@ touch locale/programs/*-kw.h %build GCC=gcc +GXX=g++ %ifarch %{ix86} BuildFlags="-march=%{_target_cpu}" %endif @@ -489,18 +490,22 @@ BuildFlags="-mcpu=ev6" %ifarch sparc BuildFlags="-fcall-used-g6" GCC="gcc -m32" +GXX="g++ -m32" %endif %ifarch sparcv9 BuildFlags="-mcpu=ultrasparc -fcall-used-g6" GCC="gcc -m32" +GXX="g++ -m32" %endif %ifarch sparc64 BuildFlags="-mcpu=ultrasparc -mvis -fcall-used-g6" GCC="gcc -m64" +GXX="g++ -m64" %endif %ifarch ppc64 BuildFlags="-mno-minimal-toc" GCC="gcc -m64" +GXX="g++ -m64" %endif BuildFlags="$BuildFlags -DNDEBUG=1" @@ -523,7 +528,7 @@ shift rm -rf $builddir mkdir $builddir ; cd $builddir build_CFLAGS="$BuildFlags -g -O3 $*" -CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ +CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ @@ -604,7 +609,7 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* # the generic one (#162634) cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h # And <bits/libc-lock.h> needs sanitizing as well. -cp -a redhat/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h +cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} @@ -1117,10 +1122,20 @@ rm -f *.filelist* %endif %changelog +* Wed Jan 4 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-26 +- update from CVS + - for newly linked lio_listio* callers, send per request + notifications (#170116) + - fixup nscd -S option removal changes (#176860) + - remove nonnull attribute from ctermid (#176753) + - fix PTHREAD_*_INITIALIZER{,_NP} on 64-bit arches + - SPARC NPTL support for pre-v9 CPUs +- drop support for 2.4.xx and < 2.6.9 kernels + * Mon Jan 2 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-25 - update from CVS - s390{,x} and sparc{,64} pointer mangling fixes - - install a sanitized LinuxThreads <bits/libc-lock.h> +- install a sanitized LinuxThreads <bits/libc-lock.h> * Mon Jan 2 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-24 - update from CVS |