diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 02:22:20 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 02:22:20 +0000 |
commit | 9af225c9114b07d2abe4268d09d806bbafd4630b (patch) | |
tree | 3a126caed31d8a11715fbed5f66f91651c69b6aa | |
parent | Remove outdated conditionals. (diff) | |
download | rtems-9af225c9114b07d2abe4268d09d806bbafd4630b.tar.bz2 |
s,%{gcclib},%{_gcclibdir}/gcc/,
-rw-r--r-- | contrib/crossrpms/gcc/install.add | 18 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/rpm-install.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/target-c++.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/target-gcc.add | 6 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/target-gfortran.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/target-gnat.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/target-objc.add | 2 |
7 files changed, 18 insertions, 22 deletions
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 4ebbad5693..b761ff9bf7 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -19,12 +19,12 @@ # 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 # host library - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext} @@ -51,17 +51,13 @@ # mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran %endif -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # 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}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools -%endif # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then @@ -91,10 +87,10 @@ echo "%dir %{_libdir}" >> dirs echo "%dir %{_libexecdir}" >> dirs %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 @@ -111,7 +107,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 75f9d654b5..1a7c95bb2d 100644 --- a/contrib/crossrpms/gcc/target-c++.add +++ b/contrib/crossrpms/gcc/target-c++.add @@ -34,7 +34,7 @@ GCC c++ compiler for @tool_target@. %dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} %{_libexecdir}/gcc/@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 7fa74a65df..2119f04bd1 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -35,17 +35,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 %{_libexecdir}/gcc diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add index d30f2a794f..5bbc0143e6 100644 --- a/contrib/crossrpms/gcc/target-gfortran.add +++ b/contrib/crossrpms/gcc/target-gfortran.add @@ -31,6 +31,6 @@ GCC fortran compiler for @tool_target@. %dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} %{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext} -%{gcclib}/@tool_target@/%{gcc_version}/finclude +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude %endif diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add index eb51575ab7..8e430d8369 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 %{_libexecdir}/gcc/@tool_target@/%{gcc_version} %{_libexecdir}/gcc/@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 eaa3a58605..f485bb1af8 100644 --- a/contrib/crossrpms/gcc/target-objc.add +++ b/contrib/crossrpms/gcc/target-objc.add @@ -23,6 +23,6 @@ GCC objc compiler for @tool_target@. %dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} %{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext} -%{gcclib}/@tool_target@/%{gcc_version}/include/objc +%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc %endif |