summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-07-25 16:10:46 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-07-25 16:10:46 +0000
commite8b0467ab5d6da11c1408b6148b4e3c2bac1b049 (patch)
tree875b1f55f135f6895992ecf32d30c3d882f493c7 /contrib
parentNew. (diff)
downloadrtems-e8b0467ab5d6da11c1408b6148b4e3c2bac1b049.tar.bz2
More %if %build_newlib blocks.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/crossrpms/gcc/gccnewlib.add2
-rw-r--r--contrib/crossrpms/gcc/install.add2
2 files changed, 4 insertions, 0 deletions
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index dbb4abd98e..aaad153440 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -36,7 +36,9 @@ Requires: @rpmprefix@gcc-common
Requires: @rpmprefix@@tool_target@-binutils
Requires: @rpmprefix@@tool_target@-sys-root
Requires: @rpmprefix@@tool_target@-w32api-sys-root
+%if %build_newlib
Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
+%endif
%if %build_gcj
BuildRequires: zlib-devel
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index 9d340727cf..9f9f3d8fa3 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -66,6 +66,7 @@
# Collect multilib subdirectories
f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+%if %build_newlib
echo "%defattr(-,root,root,-)" > build/files.newlib
TGTDIR="%{_prefix}/@tool_target@/lib"
for i in $f; do
@@ -76,6 +77,7 @@
;;
esac
done
+%endif
rm -f dirs ;
echo "%defattr(-,root,root,-)" >> dirs