This commit is contained in:
Jakub Jelinek 2006-11-30 17:32:26 +00:00
parent 21860bef84
commit 1e072aa374
1 changed files with 14 additions and 2 deletions

View File

@ -945,7 +945,7 @@ cd ..
%if %{buildpower6} %if %{buildpower6}
cd build-%{nptl_target_cpu}-linuxnptl-power6 cd build-%{nptl_target_cpu}-linuxnptl-power6
mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6/ mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6{,x}
cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so`
ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*`
cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so`
@ -958,10 +958,18 @@ cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_li
ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso
cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so`
ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*`
pushd $RPM_BUILD_ROOT/%{_lib}/power6x
ln -sf ../power6/*.so .
cp -a ../power6/*.so.* .
popd
%ifarch %{rtkaioarches} %ifarch %{rtkaioarches}
mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6 mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6{,x}
cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/`
ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso
pushd $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6x
ln -sf ../power6/*.so .
cp -a ../power6/*.so.* .
popd
%endif %endif
cd .. cd ..
%endif %endif
@ -1452,8 +1460,10 @@ rm -f *.filelist*
%endif %endif
%if %{buildpower6} %if %{buildpower6}
%dir /%{_lib}/power6 %dir /%{_lib}/power6
%dir /%{_lib}/power6x
%ifarch %{rtkaioarches} %ifarch %{rtkaioarches}
%dir /%{_lib}/rtkaio/power6 %dir /%{_lib}/rtkaio/power6
%dir /%{_lib}/rtkaio/power6x
%endif %endif
%endif %endif
%ifarch s390x %ifarch s390x
@ -1547,6 +1557,8 @@ rm -f *.filelist*
in __libc_start_main instead) in __libc_start_main instead)
- add unwind info for x86-64 restore_rt signal return landing pad - add unwind info for x86-64 restore_rt signal return landing pad
(#217087) (#217087)
- add power6x subdir to /%{_lib}/ and /%{_lib}/rtkaio/,
link all libs from ../power6/* into them
* Tue Nov 28 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-8 * Tue Nov 28 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-8
- fix svc_run (#216834, BZ#3559) - fix svc_run (#216834, BZ#3559)