Index: SPECS/gcc41.spec =================================================================== --- SPECS.orig/gcc41.spec +++ SPECS/gcc41.spec @@ -10,6 +10,7 @@ %define build_ada 0 %endif %define build_java 1 +%define build_objc 1 %ifarch s390x %define multilib_32_arch s390 %endif @@ -804,7 +805,9 @@ fi pushd $FULLPATH if [ "%{_lib}" = "lib" ]; then +%if %{build_objc} ln -sf ../../../libobjc.so.1 libobjc.so +%endif ln -sf ../../../libstdc++.so.6.* libstdc++.so ln -sf ../../../libgfortran.so.1.* libgfortran.so ln -sf ../../../libgomp.so.1.* libgomp.so @@ -824,7 +827,9 @@ ln -sf ../../../../libgnat-*.so libgnat- cd .. %endif else +%if %{build_objc} ln -sf ../../../../%{_lib}/libobjc.so.1 libobjc.so +%endif ln -sf ../../../../%{_lib}/libstdc++.so.6.* libstdc++.so ln -sf ../../../../%{_lib}/libgfortran.so.1.* libgfortran.so ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so @@ -851,13 +856,17 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/ mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libsupc++.*a . mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortran.*a . mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortranbegin.*a . +%if %{build_objc} mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a . +%endif mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a . mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a . mv -f $RPM_BUILD_ROOT%{_prefix}/include/mf-runtime.h include/ %ifarch sparc ppc +%if %{build_objc} ln -sf ../../../../../lib64/libobjc.so.1 64/libobjc.so +%endif ln -sf ../`echo ../../../../lib/libstdc++.so.6.* | sed s~/lib/~/lib64/~` 64/libstdc++.so ln -sf ../`echo ../../../../lib/libgfortran.so.1.* | sed s~/lib/~/lib64/~` 64/libgfortran.so ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so @@ -873,7 +882,9 @@ ln -sf ../lib64/libgcj_bc.so 64/libgcj_b mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libsupc++.*a 64/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortran.*a 64/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortranbegin.*a 64/ +%if %{build_objc} mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/ +%endif mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libmudflap{,th}.*a 64/ ln -sf lib32/libstdc++.a libstdc++.a @@ -881,7 +892,9 @@ ln -sf ../lib64/libstdc++.a 64/libstdc++ %endif %ifarch %{multilib_64_archs} mkdir -p 32 +%if %{build_objc} ln -sf ../../../../libobjc.so.1 32/libobjc.so +%endif ln -sf ../`echo ../../../../lib64/libstdc++.so.6.* | sed s~/../lib64/~/~` 32/libstdc++.so ln -sf ../`echo ../../../../lib64/libgfortran.so.1.* | sed s~/../lib64/~/~` 32/libgfortran.so ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so @@ -895,7 +908,9 @@ ln -sf ../`echo ../../../../lib64/libgij mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libsupc++.*a 32/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortran.*a 32/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortranbegin.*a 32/ +%if %{build_objc} mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/ +%endif mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/ mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libmudflap{,th}.*a 32/ %endif @@ -923,7 +938,9 @@ popd chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortran.so.1.* chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.so.1.* chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.so.0.* +%if %{build_objc} chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.so.1.* +%endif %if %{build_ada} chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgnarl*so* @@ -1283,6 +1300,7 @@ fi %endif %doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README* libstdc++-v3/docs/html/ +%if %{build_objc} %files objc %defattr(-,root,root) %dir %{_prefix}/lib/gcc @@ -1319,6 +1337,7 @@ fi %files -n libobjc %defattr(-,root,root) %{_prefix}/%{_lib}/libobjc.so.1* +%endif %files gfortran %defattr(-,root,root)