[rtems-crossrpms commit] Workaround w32api packaging issues.
Ralf Corsepius
ralf at rtems.org
Thu Jan 30 18:03:15 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: 49e575b688bf67707fdafb5da0f86751a06b0867
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=49e575b688bf67707fdafb5da0f86751a06b0867
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Wed Dec 18 18:21:42 2013 +0100
Workaround w32api packaging issues.
---
cygwin/gcc.am | 5 ++++-
cygwin/i686/Makefile.in | 5 ++++-
cygwin/i686/i686-pc-cygwin-gcc.spec | 1 +
freebsd7.4/gcc.am | 2 +-
freebsd7.4/i586/Makefile.in | 2 +-
freebsd8.4/gcc.am | 2 +-
freebsd8.4/i586/Makefile.in | 2 +-
freebsd8.4/x86_64/Makefile.in | 2 +-
freebsd9.2/gcc.am | 2 +-
freebsd9.2/i586/Makefile.in | 2 +-
freebsd9.2/x86_64/Makefile.in | 2 +-
gcc/gccnewlib.add | 2 ++
rtems4.11/arm/Makefile.in | 2 +-
rtems4.11/avr/Makefile.in | 2 +-
rtems4.11/bfin/Makefile.in | 2 +-
rtems4.11/gcc.am | 2 +-
rtems4.11/h8300/Makefile.in | 2 +-
rtems4.11/i386/Makefile.in | 2 +-
rtems4.11/lm32/Makefile.in | 2 +-
rtems4.11/m32c/Makefile.in | 2 +-
rtems4.11/m32r/Makefile.in | 2 +-
rtems4.11/m68k/Makefile.in | 2 +-
rtems4.11/microblaze/Makefile.in | 2 +-
rtems4.11/mips/Makefile.in | 2 +-
rtems4.11/powerpc/Makefile.in | 2 +-
rtems4.11/sh/Makefile.in | 2 +-
rtems4.11/sparc/Makefile.in | 2 +-
rtems4.11/sparc64/Makefile.in | 2 +-
rtems4.11/v850/Makefile.in | 2 +-
solaris2.7/gcc.am | 2 +-
solaris2.7/sparc/Makefile.in | 2 +-
31 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/cygwin/gcc.am b/cygwin/gcc.am
index 61f323c..dcf1535 100644
--- a/cygwin/gcc.am
+++ b/cygwin/gcc.am
@@ -18,7 +18,8 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
- cat $(GCC_SUBPACKAGES) | sed \
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
@@ -29,6 +30,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "/[@]tool_target[@]-newlib/d" \
-e "/^BuildRequ.*[@]tool_target[@]-w32api-headers-sys-root/d" \
-e "s,[@]tool_target[@]-w32api-headers-sys-root, at tool_target@-w32api-headers," \
+ -e "/^BuildRequ.*[@]tool_target[@]-w32api-runtime-sys-root/d" \
+ -e "s,[@]tool_target[@]-w32api-runtime-sys-root, at tool_target@-w32api-runtime," \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index d5d42a1..5cb19c4 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -686,7 +686,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti
$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
- cat $(GCC_SUBPACKAGES) | sed \
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
@@ -697,6 +698,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "/[@]tool_target[@]-newlib/d" \
-e "/^BuildRequ.*[@]tool_target[@]-w32api-headers-sys-root/d" \
-e "s,[@]tool_target[@]-w32api-headers-sys-root, at tool_target@-w32api-headers," \
+ -e "/^BuildRequ.*[@]tool_target[@]-w32api-runtime-sys-root/d" \
+ -e "s,[@]tool_target[@]-w32api-runtime-sys-root, at tool_target@-w32api-runtime," \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index 1164a31..a9100b3 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -253,6 +253,7 @@ BuildRequires: i686-pc-cygwin-sys-root
Requires: i686-pc-cygwin-binutils
Requires: i686-pc-cygwin-sys-root
Requires: i686-pc-cygwin-w32api-headers
+Requires: i686-pc-cygwin-w32api-runtime
Requires: i686-pc-cygwin-gcc-libgcc = %{gcc_rpmvers}-%{release}
%if "%{gcc_version}" >= "4.5.0"
diff --git a/freebsd7.4/gcc.am b/freebsd7.4/gcc.am
index 6202b31..e4995e8 100644
--- a/freebsd7.4/gcc.am
+++ b/freebsd7.4/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/freebsd7.4/i586/Makefile.in b/freebsd7.4/i586/Makefile.in
index 60b55f8..574f498 100644
--- a/freebsd7.4/i586/Makefile.in
+++ b/freebsd7.4/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/freebsd8.4/gcc.am b/freebsd8.4/gcc.am
index 6202b31..e4995e8 100644
--- a/freebsd8.4/gcc.am
+++ b/freebsd8.4/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/freebsd8.4/i586/Makefile.in b/freebsd8.4/i586/Makefile.in
index af14311..9deb338 100644
--- a/freebsd8.4/i586/Makefile.in
+++ b/freebsd8.4/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/freebsd8.4/x86_64/Makefile.in b/freebsd8.4/x86_64/Makefile.in
index 72093bb..5a0ecef 100644
--- a/freebsd8.4/x86_64/Makefile.in
+++ b/freebsd8.4/x86_64/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/freebsd9.2/gcc.am b/freebsd9.2/gcc.am
index 6202b31..e4995e8 100644
--- a/freebsd9.2/gcc.am
+++ b/freebsd9.2/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/freebsd9.2/i586/Makefile.in b/freebsd9.2/i586/Makefile.in
index d6fdcd4..28581a9 100644
--- a/freebsd9.2/i586/Makefile.in
+++ b/freebsd9.2/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/freebsd9.2/x86_64/Makefile.in b/freebsd9.2/x86_64/Makefile.in
index 9263fa2..44b5164 100644
--- a/freebsd9.2/x86_64/Makefile.in
+++ b/freebsd9.2/x86_64/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/gcc/gccnewlib.add b/gcc/gccnewlib.add
index 677ebf8..8ff7454 100644
--- a/gcc/gccnewlib.add
+++ b/gcc/gccnewlib.add
@@ -225,6 +225,7 @@ BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
BuildRequires: @rpmprefix@@tool_target at -binutils
BuildRequires: @rpmprefix@@tool_target at -sys-root
BuildRequires: @rpmprefix@@tool_target at -w32api-headers-sys-root
+BuildRequires: @rpmprefix@@tool_target at -w32api-runtime-sys-root
%if %build_infos
Requires: @rpmprefix at gcc-common
@@ -232,6 +233,7 @@ Requires: @rpmprefix at gcc-common
Requires: @rpmprefix@@tool_target at -binutils
Requires: @rpmprefix@@tool_target at -sys-root
Requires: @rpmprefix@@tool_target at -w32api-headers-sys-root
+Requires: @rpmprefix@@tool_target at -w32api-runtime-sys-root
Requires: @rpmprefix@@tool_target at -gcc-libgcc = %{gcc_rpmvers}-%{release}
%if %build_newlib
Requires: @rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index c7061d6..a35c20f 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/avr/Makefile.in b/rtems4.11/avr/Makefile.in
index a01cef1..36dd18f 100644
--- a/rtems4.11/avr/Makefile.in
+++ b/rtems4.11/avr/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/bfin/Makefile.in b/rtems4.11/bfin/Makefile.in
index 01c596f..da8d97e 100644
--- a/rtems4.11/bfin/Makefile.in
+++ b/rtems4.11/bfin/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/gcc.am b/rtems4.11/gcc.am
index 3e311f6..e299f50 100644
--- a/rtems4.11/gcc.am
+++ b/rtems4.11/gcc.am
@@ -37,7 +37,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/h8300/Makefile.in b/rtems4.11/h8300/Makefile.in
index e8bf8ad..115e145 100644
--- a/rtems4.11/h8300/Makefile.in
+++ b/rtems4.11/h8300/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/i386/Makefile.in b/rtems4.11/i386/Makefile.in
index d8e911d..d996a1f 100644
--- a/rtems4.11/i386/Makefile.in
+++ b/rtems4.11/i386/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/lm32/Makefile.in b/rtems4.11/lm32/Makefile.in
index 55e3de6..2edac61 100644
--- a/rtems4.11/lm32/Makefile.in
+++ b/rtems4.11/lm32/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m32c/Makefile.in b/rtems4.11/m32c/Makefile.in
index 1ea2949..fd7c88c 100644
--- a/rtems4.11/m32c/Makefile.in
+++ b/rtems4.11/m32c/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m32r/Makefile.in b/rtems4.11/m32r/Makefile.in
index 17bcaf0..fb42ea5 100644
--- a/rtems4.11/m32r/Makefile.in
+++ b/rtems4.11/m32r/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m68k/Makefile.in b/rtems4.11/m68k/Makefile.in
index b378620..6735540 100644
--- a/rtems4.11/m68k/Makefile.in
+++ b/rtems4.11/m68k/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/microblaze/Makefile.in b/rtems4.11/microblaze/Makefile.in
index c18ed67..1f07564 100644
--- a/rtems4.11/microblaze/Makefile.in
+++ b/rtems4.11/microblaze/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/mips/Makefile.in b/rtems4.11/mips/Makefile.in
index 31b27bd..f82ac1f 100644
--- a/rtems4.11/mips/Makefile.in
+++ b/rtems4.11/mips/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/powerpc/Makefile.in b/rtems4.11/powerpc/Makefile.in
index 82ee606..0e546df 100644
--- a/rtems4.11/powerpc/Makefile.in
+++ b/rtems4.11/powerpc/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sh/Makefile.in b/rtems4.11/sh/Makefile.in
index 7ff93de..ddefec0 100644
--- a/rtems4.11/sh/Makefile.in
+++ b/rtems4.11/sh/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sparc/Makefile.in b/rtems4.11/sparc/Makefile.in
index 6a23d54..8d0720e 100644
--- a/rtems4.11/sparc/Makefile.in
+++ b/rtems4.11/sparc/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sparc64/Makefile.in b/rtems4.11/sparc64/Makefile.in
index ddb6fd3..516c620 100644
--- a/rtems4.11/sparc64/Makefile.in
+++ b/rtems4.11/sparc64/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index 148d83b..1479d70 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/solaris2.7/gcc.am b/solaris2.7/gcc.am
index 3eaa237..5ce8718 100644
--- a/solaris2.7/gcc.am
+++ b/solaris2.7/gcc.am
@@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/solaris2.7/sparc/Makefile.in b/solaris2.7/sparc/Makefile.in
index 6b9b132..da1636a 100644
--- a/solaris2.7/sparc/Makefile.in
+++ b/solaris2.7/sparc/Makefile.in
@@ -475,7 +475,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "/[@]tool_target[@]-w32api-.*-sys-root/d" \
-e "/--with-newlib/d" \
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
More information about the vc
mailing list