summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2007-02-26 09:36:22 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2007-02-26 09:36:22 +0000
commita5f0d3f61c12721e1de0984f1d50a732eab03e71 (patch)
treeb7993f2a89a350a8135f1290bf4e6a426dd88813
parentAdd GDB_PKGVERS. (diff)
downloadrtems-a5f0d3f61c12721e1de0984f1d50a732eab03e71.tar.bz2
Add BINUTILS_PKGVERS.
-rw-r--r--contrib/crossrpms/binutils/binutils.add4
-rw-r--r--contrib/crossrpms/binutils/build.add2
-rw-r--r--contrib/crossrpms/binutils/prep.add2
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index 1673757f1d..01b86d2e7c 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -1,5 +1,6 @@
+%define binutils_pkgvers @BINUTILS_PKGVERS@
%define binutils_version @BINUTILS_VERS@
-%define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)}
+%define binutils_rpmvers %{expand:%(echo "@BINUTILS_VERS@" | tr - _ )}
Name: @rpmprefix@@tool_target@-binutils
Summary: Binutils for target @tool_target@
@@ -19,7 +20,6 @@ BuildRequires: flex
BuildRequires: bison
%if %build_infos
-# Requires: @rpmprefix@rtems4.7-base-binutils
Requires: @rpmprefix@binutils-common
%endif
diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add
index 4c22c6a44a..60e3ae929c 100644
--- a/contrib/crossrpms/binutils/build.add
+++ b/contrib/crossrpms/binutils/build.add
@@ -2,7 +2,7 @@
mkdir -p build
cd build
CFLAGS="$RPM_OPT_FLAGS" \
- ../binutils-%{binutils_version}/configure \
+ ../binutils-%{binutils_pkgvers}/configure \
--build=%_build --host=%_host \
--target=@tool_target@ \
--verbose --disable-nls \
diff --git a/contrib/crossrpms/binutils/prep.add b/contrib/crossrpms/binutils/prep.add
index 23a76a8b57..3f2f71910f 100644
--- a/contrib/crossrpms/binutils/prep.add
+++ b/contrib/crossrpms/binutils/prep.add
@@ -2,7 +2,7 @@
%setup -q -c -T -n %{name}-%{version}
%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_version}
+cd binutils-%{binutils_pkgvers}
%{?PATCH0:%patch0 -p1}
cd ..