forked from Imagelibrary/rtems
Merger from CVS-HEAD.
This commit is contained in:
@@ -2,11 +2,15 @@
|
|||||||
%setup -c -T -n %{name}-%{version}
|
%setup -c -T -n %{name}-%{version}
|
||||||
|
|
||||||
%setup -q -T -D -n %{name}-%{version} -a0
|
%setup -q -T -D -n %{name}-%{version} -a0
|
||||||
%{?PATCH0:%patch0 -p0}
|
cd gcc-%{gcc_pkgvers}
|
||||||
|
%{?PATCH0:%patch0 -p1}
|
||||||
|
cd ..
|
||||||
|
|
||||||
%if %build_cxx
|
%if %build_cxx
|
||||||
%setup -q -T -D -n %{name}-%{version} -a1
|
%setup -q -T -D -n %{name}-%{version} -a1
|
||||||
%{?PATCH1:%patch1 -p0}
|
cd gcc-%{gcc_pkgvers}
|
||||||
|
%{?PATCH1:%patch1 -p1}
|
||||||
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %build_fortran
|
%if %build_fortran
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
|
|||||||
cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
|
cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
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
|
EOF
|
||||||
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
|
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
|
||||||
%define __find_provides %{_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
|
cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
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
|
EOF
|
||||||
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
|
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
|
||||||
%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
|
%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
|
||||||
|
|||||||
Reference in New Issue
Block a user