From 844ac396edd48003172a31c3b6052a78f0bb64cd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 6 Aug 2011 05:42:58 +0000 Subject: Eliminate gcclib. --- contrib/crossrpms/gcc/gccnewlib.add | 2 +- contrib/crossrpms/gcc/install.add | 12 ++++++------ contrib/crossrpms/gcc/rpm-install.add | 4 ++-- contrib/crossrpms/gcc/target-c++.add | 4 ++-- contrib/crossrpms/gcc/target-gcc.add | 6 +++--- contrib/crossrpms/gcc/target-gnat.add | 4 ++-- contrib/crossrpms/gcc/target-objc.add | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index f79f5327d7..af06973dcf 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -87,8 +87,8 @@ BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMRE BuildRequires: gmp-devel %endif -%define gcclib %{_libdir}/gcc %define gccexec %{_libexecdir}/gcc +%global _gcclibdir %{_prefix}/lib @SOURCES@ diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 55ba310c95..398e511724 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -19,7 +19,7 @@ # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/@tool_target@/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ fi %endif @@ -56,7 +56,7 @@ # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory @@ -89,10 +89,10 @@ echo "%dir %{_libexecdir}" >> dirs %endif %endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/@tool_target@" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs - TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -109,7 +109,7 @@ cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index 3f00749d5b..e9f1c4e39b 100644 --- a/contrib/crossrpms/gcc/rpm-install.add +++ b/contrib/crossrpms/gcc/rpm-install.add @@ -34,7 +34,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides + | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -42,7 +42,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires + | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add index 01b4592f32..5cd6b004ce 100644 --- a/contrib/crossrpms/gcc/target-c++.add +++ b/contrib/crossrpms/gcc/target-c++.add @@ -32,7 +32,7 @@ GCC c++ compiler for @tool_target@. %dir %{gccexec}/@tool_target@/%{gcc_version} %{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/@tool_target@/%{gcc_version}/include -%{gcclib}/@tool_target@/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++ %endif diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index cfa42da8c2..3aa8453e49 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -31,17 +31,17 @@ GNU cc compiler for @tool_target@. %{_bindir}/@tool_target@-gcov%{_exeext} %{_bindir}/@tool_target@-gccbug -%dir %{gcclib}/@tool_target@/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "@tool_target@" != "bfin-rtems@rtems_api@" %if "@tool_target@" != "avr-rtems@rtems_api@" -%dir %{gcclib}/@tool_target@/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed %endif %dir %{gccexec} diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add index bd6482380e..4296161c32 100644 --- a/contrib/crossrpms/gcc/target-gnat.add +++ b/contrib/crossrpms/gcc/target-gnat.add @@ -29,7 +29,7 @@ This is the gcc/gnat compiler for @tool_target@. %dir %{gccexec}/@tool_target@/%{gcc_version} %{gccexec}/@tool_target@/%{gcc_version}/gnat1%{_exeext} -%{gcclib}/@tool_target@/%{gcc_version}/adalib -%{gcclib}/@tool_target@/%{gcc_version}/adainclude +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude %endif diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add index 8ed3aa58f5..adf5a27b71 100644 --- a/contrib/crossrpms/gcc/target-objc.add +++ b/contrib/crossrpms/gcc/target-objc.add @@ -21,6 +21,6 @@ GCC objc compiler for @tool_target@. %dir %{gccexec}/@tool_target@/%{gcc_version} %{gccexec}/@tool_target@/%{gcc_version}/cc1obj%{_exeext} -%{gcclib}/@tool_target@/%{gcc_version}/include/objc +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc %endif -- cgit v1.2.3