From 0f606917cf039aa01f6d1a822782b57b1dbf7e16 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 16 Feb 2006 14:38:01 +0000 Subject: [PATCH] Eliminate deps on %{newlib_version} --- contrib/crossrpms/cygwin/Makefile.am | 2 +- contrib/crossrpms/freebsd5.2/Makefile.am | 2 +- contrib/crossrpms/freebsd6.0/Makefile.am | 2 +- contrib/crossrpms/mingw32/Makefile.am | 2 +- contrib/crossrpms/solaris2.7/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index d35a42c082..4e245c1173 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -72,7 +72,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add -e "/[@]SOURCES[@]/d" \ -e '/^%define _prefix.*$$/d' \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ - -e "s,= %{newlib_version}-%{release},," \ + -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[@]rpmprefix[@],,g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index 9926d98e72..1efe1a1161 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -75,7 +75,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add -e "s,[@]rpmprefix[@],,g" \ -e "s,rtems[@]osversion[@],rtems,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ - -e "s,= %{newlib_version}-%{release},," \ + -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "/--with-newlib/d" \ -e "/^%package -n @tool_target@-gcc/d" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am index 8614e32b8c..92c3ac2bc5 100644 --- a/contrib/crossrpms/freebsd6.0/Makefile.am +++ b/contrib/crossrpms/freebsd6.0/Makefile.am @@ -75,7 +75,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add -e "s,[@]rpmprefix[@],,g" \ -e "s,rtems[@]osversion[@],rtems,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ - -e "s,= %{newlib_version}-%{release},," \ + -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "/--with-newlib/d" \ -e "/^%package -n @tool_target@-gcc/d" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index c885a7c9cf..0dd77ab5c9 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -110,7 +110,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add -e "s,[@]rpmprefix[@],,g" \ -e "s,rtems[@]osversion[@],rtems,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ - -e "s,= %{newlib_version}-%{release},," \ + -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "/^%package -n @tool_target@-gcc/d" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index 1ff711b2c6..9c0d23a64b 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -75,7 +75,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add -e "s,[@]rpmprefix[@],,g" \ -e "s,rtems[@]osversion[@],rtems,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ - -e "s,= %{newlib_version}-%{release},," \ + -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "/--with-newlib/d" \ -e "/^%package -n @tool_target@-gcc/d" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \