diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-08-06 05:47:22 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-08-06 05:47:22 +0000 |
| commit | 5b76deeeb2c7e63b733818aadaf44d25e74de021 (patch) | |
| tree | 58eb29698b2231b3585e8bf80926cded5fba9bed | |
| parent | 844ac396edd48003172a31c3b6052a78f0bb64cd (diff) | |
Merger from CVS-HEAD.
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 8 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/rpm-install.add | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index a3adba1a09..ae480de8d0 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -2,11 +2,15 @@ %setup -c -T -n %{name}-%{version} %setup -q -T -D -n %{name}-%{version} -a0 -%{?PATCH0:%patch0 -p0} +cd gcc-%{gcc_pkgvers} +%{?PATCH0:%patch0 -p1} +cd .. %if %build_cxx %setup -q -T -D -n %{name}-%{version} -a1 -%{?PATCH1:%patch1 -p0} +cd gcc-%{gcc_pkgvers} +%{?PATCH1:%patch1 -p1} +cd .. %endif %if %build_fortran diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index e9f1c4e39b..e1b456dd19 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}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides + %{?_gcclibdir:| 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}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires + %{?_gcclibdir:| 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 |