summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-02-22 11:54:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-02-22 11:54:10 +0000
commitc8956fd7e9418e2f7978975bda4e8c532e43005d (patch)
tree7e865b5dd3c113226c6acc93c6896b6e4ed73c63 /contrib
parentRun make install-info to get the newlib infos (diff)
downloadrtems-c8956fd7e9418e2f7978975bda4e8c532e43005d.tar.bz2
Use gcc_version instead of %version, to work around rpm screwing up on %version in mixed-versioned packages.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/crossrpms/gcc/rpm-install.add12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add
index ec749c352b..0dc5461c10 100644
--- a/contrib/crossrpms/gcc/rpm-install.add
+++ b/contrib/crossrpms/gcc/rpm-install.add
@@ -31,19 +31,19 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
%define __os_install_post . ./os_install_post
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{gcc_version}/find-provides
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \
| grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides
EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
+chmod +x %{_builddir}/%{name}-%{gcc_version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{gcc_version}/find-provides
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{gcc_version}/find-requires
#!/bin/sh
grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \
| grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires
EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
+chmod +x %{_builddir}/%{name}-%{gcc_version}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{gcc_version}/find-requires