rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

2.9.90-13

Browse Source
This commit is contained in:
Jakub Jelinek 2009-04-07 13:39:49 +00:00
parent be304ecfa3
commit 21be1f9bd4
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glibc.spec
View File

@ -54,17 +54,6 @@ Requires(pre): basesystem, libgcc
BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3 BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
BuildRequires: /bin/ps, /bin/kill, /bin/awk BuildRequires: /bin/ps, /bin/kill, /bin/awk
%ifarch %{ix86} x86_64 ppc ppc64
BuildRequires: /usr/bin/setarch
%ifarch %{ix86}
%define setarch /usr/bin/setarch i386 -R
%endif
%ifarch x86_64 ppc ppc64
%define setarch /usr/bin/setarch %{_target_cpu} -R
%endif
%else
%define setarch %{nil}
%endif
# This is to ensure that __frame_state_for is exported by glibc # This is to ensure that __frame_state_for is exported by glibc
# will be compatible with egcs 1.x.y # will be compatible with egcs 1.x.y
BuildRequires: gcc >= 3.2 BuildRequires: gcc >= 3.2
@ -255,6 +244,8 @@ rm -f sysdeps/alpha/alphaev6/memcpy.S
rm -f sysdeps/powerpc/powerpc32/power4/hp-timing.[ch] rm -f sysdeps/powerpc/powerpc32/power4/hp-timing.[ch]
%endif %endif
rm -rf sysdeps/x86_64/memchr.S
find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \; find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
cat > find_provides.sh <<EOF cat > find_provides.sh <<EOF
#!/bin/sh #!/bin/sh
@ -336,7 +327,7 @@ CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
--host %{nptl_target_cpu}-redhat-linux \ --host %{nptl_target_cpu}-redhat-linux \
--disable-profile --enable-experimental-malloc --enable-nss-crypt --disable-profile --enable-experimental-malloc --enable-nss-crypt
%{setarch} make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
cd .. cd ..
} }
@ -388,7 +379,7 @@ mkdir -p $RPM_BUILD_ROOT
make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
%ifnarch %{auxarches} %ifnarch %{auxarches}
cd build-%{nptl_target_cpu}-linuxnptl && \ cd build-%{nptl_target_cpu}-linuxnptl && \
%{setarch} make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
cd .. cd ..
%endif %endif
@ -717,7 +708,7 @@ export TIMEOUTFACTOR=16
parent=$$ parent=$$
echo ====================TESTING========================= echo ====================TESTING=========================
cd build-%{nptl_target_cpu}-linuxnptl cd build-%{nptl_target_cpu}-linuxnptl
( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
sleep 10s sleep 10s
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
[ -n "$teepid" ] && kill $teepid [ -n "$teepid" ] && kill $teepid
@ -726,7 +717,7 @@ cd ..
%if %{buildxen} %if %{buildxen}
echo ====================TESTING -mno-tls-direct-seg-refs============= echo ====================TESTING -mno-tls-direct-seg-refs=============
cd build-%{nptl_target_cpu}-linuxnptl-nosegneg cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
sleep 10s sleep 10s
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
[ -n "$teepid" ] && kill $teepid [ -n "$teepid" ] && kill $teepid
@ -739,7 +730,7 @@ cd build-%{nptl_target_cpu}-linuxnptl-power6
( if [ -d ../power6emul ]; then ( if [ -d ../power6emul ]; then
export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
fi fi
%{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
sleep 10s sleep 10s
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
[ -n "$teepid" ] && kill $teepid [ -n "$teepid" ] && kill $teepid
@ -1028,7 +1019,6 @@ rm -f *.filelist*
- update from trunk - update from trunk
- fix strverscmp (#494457) - fix strverscmp (#494457)
- configure with --enable-nss-crypt - configure with --enable-nss-crypt
- workaround buggy kernels during glibc build process, argh
* Wed Apr 1 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-12 * Wed Apr 1 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-12
- update from trunk - update from trunk