forked from rpms/glibc
2.14.90-3
This commit is contained in:
Andreas Schwab
parent
4dd080e34a
commit
444e2cc188
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
/glibc-2.14-101-gdefe906-fedora.tar.xz
|
||||
/glibc-2.14-101-gdefe906.tar.xz
|
||||
/glibc-ports-2.14-3-ge5cd24d.tar.xz
|
||||
/glibc-2.14-121-g5551a7b-fedora.tar.xz
|
||||
/glibc-2.14-121-g5551a7b.tar.xz
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
77
glibc.spec
77
glibc.spec
@ -1,4 +1,4 @@
|
||||
%define glibcsrcdir glibc-2.14-101-gdefe906
|
||||
%define glibcsrcdir glibc-2.14-121-g5551a7b
|
||||
%define glibcversion 2.14.90
|
||||
%define glibcportsdir glibc-ports-2.14-3-ge5cd24d
|
||||
### glibc.spec.in follows:
|
||||
@ -28,7 +28,7 @@
|
||||
Summary: The GNU libc libraries
|
||||
Name: glibc
|
||||
Version: %{glibcversion}
|
||||
Release: 2
|
||||
Release: 3
|
||||
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
|
||||
# Things that are linked directly into dynamically linked programs
|
||||
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
|
||||
@ -64,10 +64,9 @@ BuildRequires: systemtap-sdt-devel
|
||||
BuildRequires: gcc >= 3.2
|
||||
%define enablekernel 2.6.32
|
||||
Conflicts: kernel < %{enablekernel}
|
||||
%ifarch i386
|
||||
%define nptl_target_cpu i486
|
||||
%else
|
||||
%define nptl_target_cpu %{_target_cpu}
|
||||
%define target %{_target_cpu}-redhat-linux
|
||||
%ifarch %{arm}
|
||||
%define target %{_target_cpu}-redhat-linuxeabi
|
||||
%endif
|
||||
%ifarch %{multiarcharches}
|
||||
# Need STT_IFUNC support
|
||||
@ -285,7 +284,7 @@ touch locale/programs/*-kw.h
|
||||
GCC=gcc
|
||||
GXX=g++
|
||||
%ifarch %{ix86}
|
||||
BuildFlags="-march=%{nptl_target_cpu} -mtune=generic"
|
||||
BuildFlags="-march=%{_target_cpu} -mtune=generic"
|
||||
%endif
|
||||
%ifarch i686
|
||||
BuildFlags="-march=i686 -mtune=generic"
|
||||
@ -345,10 +344,10 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai
|
||||
AddOns=,rtkaio$AddOns
|
||||
%endif
|
||||
|
||||
build_nptl()
|
||||
build()
|
||||
{
|
||||
builddir=build-%{nptl_target_cpu}-$1
|
||||
shift
|
||||
builddir=build-%{target}${1:+-$1}
|
||||
${1+shift}
|
||||
rm -rf $builddir
|
||||
mkdir $builddir ; cd $builddir
|
||||
build_CFLAGS="$BuildFlags -g -O3 $*"
|
||||
@ -359,8 +358,7 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
|
||||
--prefix=%{_prefix} \
|
||||
--enable-add-ons=../%{glibcportsdir},nptl$AddOns \
|
||||
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
|
||||
--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
|
||||
--host %{nptl_target_cpu}-redhat-linux \
|
||||
--with-tls --with-__thread --build=%{target} \
|
||||
%ifarch %{multiarcharches}
|
||||
--enable-multi-arch \
|
||||
%endif
|
||||
@ -375,10 +373,10 @@ make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules}
|
||||
cd ..
|
||||
}
|
||||
|
||||
build_nptl linuxnptl
|
||||
build
|
||||
|
||||
%if %{buildxen}
|
||||
build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs
|
||||
build nosegneg -mno-tls-direct-seg-refs
|
||||
%endif
|
||||
|
||||
%if %{buildpower6}
|
||||
@ -398,11 +396,11 @@ fi
|
||||
AddOns="$AddOns --with-cpu=power6"
|
||||
GCC="$GCC -mcpu=power6"
|
||||
GXX="$GXX -mcpu=power6"
|
||||
build_nptl linuxnptl-power6
|
||||
build power6
|
||||
)
|
||||
%endif
|
||||
|
||||
cd build-%{nptl_target_cpu}-linuxnptl
|
||||
cd build-%{target}
|
||||
$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
|
||||
'-DLIBTLS="/%{_lib}/tls/"' \
|
||||
'-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
|
||||
@ -415,9 +413,9 @@ GCC=`cat Gcc`
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT
|
||||
make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl %{silentrules}
|
||||
make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} %{silentrules}
|
||||
%ifnarch %{auxarches}
|
||||
cd build-%{nptl_target_cpu}-linuxnptl && \
|
||||
cd build-%{target} && \
|
||||
make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
|
||||
cd ..
|
||||
%endif
|
||||
@ -438,7 +436,7 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/
|
||||
%define nosegneg_subdir_base i686
|
||||
%define nosegneg_subdir i686/nosegneg
|
||||
%define nosegneg_subdir_up ../..
|
||||
cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
|
||||
cd build-%{target}-nosegneg
|
||||
destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir}
|
||||
mkdir -p $destdir
|
||||
for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
|
||||
@ -446,7 +444,7 @@ do
|
||||
libbase=${lib#*/}
|
||||
libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
|
||||
# Only install if different from base lib
|
||||
if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then
|
||||
if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then
|
||||
ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso
|
||||
else
|
||||
cp -a ${lib}.so $destdir/$libbaseso
|
||||
@ -457,7 +455,7 @@ done
|
||||
destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir}
|
||||
mkdir -p $destdir
|
||||
librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
|
||||
if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then
|
||||
if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then
|
||||
ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso
|
||||
else
|
||||
cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
|
||||
@ -468,7 +466,7 @@ cd ..
|
||||
%endif
|
||||
|
||||
%if %{buildpower6}
|
||||
cd build-%{nptl_target_cpu}-linuxnptl-power6
|
||||
cd build-%{target}-power6
|
||||
destdir=$RPM_BUILD_ROOT/%{_lib}/power6
|
||||
mkdir -p ${destdir}
|
||||
for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
|
||||
@ -550,7 +548,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
|
||||
chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
|
||||
|
||||
# Install the upgrade program
|
||||
install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \
|
||||
install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
|
||||
$RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
|
||||
|
||||
strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
|
||||
@ -572,9 +570,9 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
|
||||
rm locale-archive || :
|
||||
# Intentionally we do not pass --alias-file=, aliases will be added
|
||||
# by build-locale-archive.
|
||||
$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
|
||||
--library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
|
||||
$olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
|
||||
$olddir/build-%{target}/elf/ld.so \
|
||||
--library-path $olddir/build-%{target}/ \
|
||||
$olddir/build-%{target}/locale/localedef \
|
||||
--prefix ${RPM_BUILD_ROOT} --add-to-archive \
|
||||
*_*
|
||||
rm -rf *_*
|
||||
@ -702,15 +700,15 @@ touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc
|
||||
|
||||
cd fedora
|
||||
$GCC -Os -g -o build-locale-archive build-locale-archive.c \
|
||||
../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \
|
||||
../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \
|
||||
../build-%{target}/locale/locarchive.o \
|
||||
../build-%{target}/locale/md5.o \
|
||||
-DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
|
||||
-L../build-%{nptl_target_cpu}-linuxnptl \
|
||||
-B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
|
||||
-L../build-%{target} \
|
||||
-B../build-%{target}/csu/ -lc -lc_nonshared
|
||||
install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
|
||||
$GCC -Os -g -o tzdata-update tzdata-update.c \
|
||||
-L../build-%{nptl_target_cpu}-linuxnptl \
|
||||
-B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
|
||||
-L../build-%{target} \
|
||||
-B../build-%{target}/csu/ -lc -lc_nonshared
|
||||
install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update
|
||||
cd ..
|
||||
|
||||
@ -742,7 +740,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
|
||||
export TIMEOUTFACTOR=16
|
||||
parent=$$
|
||||
echo ====================TESTING=========================
|
||||
cd build-%{nptl_target_cpu}-linuxnptl
|
||||
cd build-%{target}
|
||||
( make %{?_smp_mflags} -k check %{silentrules} 2>&1
|
||||
sleep 10s
|
||||
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
|
||||
@ -751,7 +749,7 @@ cd build-%{nptl_target_cpu}-linuxnptl
|
||||
cd ..
|
||||
%if %{buildxen}
|
||||
echo ====================TESTING -mno-tls-direct-seg-refs=============
|
||||
cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
|
||||
cd build-%{target}-nosegneg
|
||||
( make %{?_smp_mflags} -k check %{silentrules} 2>&1
|
||||
sleep 10s
|
||||
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
|
||||
@ -761,7 +759,7 @@ cd ..
|
||||
%endif
|
||||
%if %{buildpower6}
|
||||
echo ====================TESTING -mcpu=power6=============
|
||||
cd build-%{nptl_target_cpu}-linuxnptl-power6
|
||||
cd build-%{target}-power6
|
||||
( if [ -d ../power6emul ]; then
|
||||
export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
|
||||
fi
|
||||
@ -1081,6 +1079,15 @@ rm -f *.filelist*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jul 20 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-3
|
||||
- Update from master
|
||||
- S/390: Don't use r11 in INTERNAL_VSYSCALL_NCS macro
|
||||
- Avoid warning in nscd config file parsing code
|
||||
- Improve 64 bit strcat functions with SSE2/SSSE3
|
||||
- Fix alloca accounting in strxfrm
|
||||
- Avoid possible crashes in anormal nscd exits
|
||||
- Updated Swedish and Dutch translations
|
||||
|
||||
* Thu Jul 14 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-2
|
||||
- Update from master
|
||||
- Generalize framework to register monitoring of files in nscd
|
||||
|
||||
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
9fd4de2a029035c7a38bcf87f9e40fe8 glibc-2.14-101-gdefe906-fedora.tar.xz
|
||||
e25b8839d90879597e1fc9ca6b141099 glibc-2.14-101-gdefe906.tar.xz
|
||||
cf35ba5c4f96868e2307ec80cf449d35 glibc-2.14-121-g5551a7b-fedora.tar.xz
|
||||
0021ec019a82b738e02c1c31b76fdfd5 glibc-2.14-121-g5551a7b.tar.xz
|
||||
e7ea1c6c9428ed5c2473d38092f28762 glibc-ports-2.14-3-ge5cd24d.tar.xz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user