diff options
Diffstat (limited to 'fedora/glibc.spec.in')
| -rw-r--r-- | fedora/glibc.spec.in | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index afdb05b5fa..791e04b0a8 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -8,7 +8,7 @@ %define buildxen 0 %define xenpackage 0 %endif -%define rtkaioarches noarch +%define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 %define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries. @@ -819,17 +819,12 @@ GXX="g++ -m64" %endif BuildFlags="$BuildFlags -DNDEBUG=1" -if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - BuildFlags="$BuildFlags -finline-limit=2000" -fi EnableKernel="--enable-kernel=%{enablekernel}" -echo "$BuildFlags" > BuildFlags echo "$GCC" > Gcc AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` %ifarch %{rtkaioarches} AddOns=,rtkaio$AddOns %endif -echo "$AddOns" > AddOns build_nptl() { @@ -868,9 +863,7 @@ $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_tar cd .. %install -BuildFlags=`cat BuildFlags` GCC=`cat Gcc` -AddOns=`cat AddOns` rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT @@ -881,6 +874,12 @@ cd build-%{nptl_target_cpu}-linuxnptl && \ cd .. %endif +%ifarch %{rtkaioarches} +mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio +cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/%{_lib}/rtkaio/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +%endif + %if %{buildxen} %define nosegneg_subdir_base i686 %define nosegneg_subdir i686/nosegneg @@ -895,15 +894,15 @@ cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.s pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` popd -%ifarch %{rtkaioarches} -cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` -%else cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` -%endif cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` +%ifarch %{rtkaioarches} +mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir +cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +%endif cd .. %endif @@ -1362,9 +1361,16 @@ rm -f *.filelist* %files -f rpm.filelist %defattr(-,root,root) +%ifarch %{rtkaioarches} +%dir /%{_lib}/rtkaio +%endif %if %{buildxen} && !%{xenpackage} %dir /%{_lib}/%{nosegneg_subdir_base} %dir /%{_lib}/%{nosegneg_subdir} +%ifarch %{rtkaioarches} +%dir /%{_lib}/rtkaio/%{nosegneg_subdir_base} +%dir /%{_lib}/rtkaio/%{nosegneg_subdir} +%endif %endif %ifarch s390x %dir /lib @@ -1451,6 +1457,8 @@ rm -f *.filelist* * Thu Sep 7 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-30 - fix or_IN February name (#204730) - fix pthread_create called from cancellation handlers (BZ#3124) +- add librtkaio, to use it add /%{lib}/rtkaio to your + LD_LIBRARY_PATH or /etc/ld.so.conf * Tue Sep 5 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-29 - randomize resolver query ids before use instead after use (#205113) |