From 67c1bb5ede760303b18191ecbaef8d1b0f9ba3d4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 26 Feb 2007 15:54:49 +0000 Subject: Add MKSPEC0. --- contrib/crossrpms/cygwin/binutils.am | 2 +- contrib/crossrpms/cygwin/gcc.am | 2 +- contrib/crossrpms/freebsd5.2/binutils.am | 2 +- contrib/crossrpms/freebsd5.2/gcc.am | 2 +- contrib/crossrpms/freebsd6.0/binutils.am | 2 +- contrib/crossrpms/freebsd6.0/gcc.am | 2 +- contrib/crossrpms/freebsd6.1/binutils.am | 2 +- contrib/crossrpms/freebsd6.1/gcc.am | 2 +- contrib/crossrpms/mingw32/binutils.am | 2 +- contrib/crossrpms/mingw32/gcc.am | 2 +- contrib/crossrpms/mkspec.am | 3 +++ contrib/crossrpms/rtems4.8/binutils.am | 2 +- contrib/crossrpms/rtems4.8/gcc.am | 2 +- contrib/crossrpms/rtems4.8/gdb.am | 2 +- contrib/crossrpms/solaris2.7/binutils.am | 2 +- contrib/crossrpms/solaris2.7/gcc.am | 2 +- 16 files changed, 18 insertions(+), 15 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/cygwin/binutils.am b/contrib/crossrpms/cygwin/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/cygwin/binutils.am +++ b/contrib/crossrpms/cygwin/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/cygwin/gcc.am b/contrib/crossrpms/cygwin/gcc.am index 15b7828c45..026e9a8f83 100644 --- a/contrib/crossrpms/cygwin/gcc.am +++ b/contrib/crossrpms/cygwin/gcc.am @@ -28,7 +28,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/^BuildRequ.*[@]tool_target[@]-w32api-sys-root/d" \ -e "s,[@]tool_target[@]-w32api-sys-root,@tool_target@-w32api," \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd5.2/binutils.am b/contrib/crossrpms/freebsd5.2/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/freebsd5.2/binutils.am +++ b/contrib/crossrpms/freebsd5.2/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/freebsd5.2/gcc.am b/contrib/crossrpms/freebsd5.2/gcc.am index b31439bdda..5114102ccb 100644 --- a/contrib/crossrpms/freebsd5.2/gcc.am +++ b/contrib/crossrpms/freebsd5.2/gcc.am @@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd6.0/binutils.am b/contrib/crossrpms/freebsd6.0/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/freebsd6.0/binutils.am +++ b/contrib/crossrpms/freebsd6.0/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/freebsd6.0/gcc.am b/contrib/crossrpms/freebsd6.0/gcc.am index b31439bdda..5114102ccb 100644 --- a/contrib/crossrpms/freebsd6.0/gcc.am +++ b/contrib/crossrpms/freebsd6.0/gcc.am @@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd6.1/binutils.am b/contrib/crossrpms/freebsd6.1/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/freebsd6.1/binutils.am +++ b/contrib/crossrpms/freebsd6.1/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/freebsd6.1/gcc.am b/contrib/crossrpms/freebsd6.1/gcc.am index b31439bdda..5114102ccb 100644 --- a/contrib/crossrpms/freebsd6.1/gcc.am +++ b/contrib/crossrpms/freebsd6.1/gcc.am @@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/mingw32/binutils.am b/contrib/crossrpms/mingw32/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/mingw32/binutils.am +++ b/contrib/crossrpms/mingw32/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/mingw32/gcc.am b/contrib/crossrpms/mingw32/gcc.am index 5857b609c2..27e8650f10 100644 --- a/contrib/crossrpms/mingw32/gcc.am +++ b/contrib/crossrpms/mingw32/gcc.am @@ -27,7 +27,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)/g" \ -e "/[@]tool_target[@]-newlib/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/mkspec.am b/contrib/crossrpms/mkspec.am index c1061e7f2d..2f02c5c7d7 100644 --- a/contrib/crossrpms/mkspec.am +++ b/contrib/crossrpms/mkspec.am @@ -11,3 +11,6 @@ MKSPEC = sed \ -e "/^%package -n [@]rpmprefix[@][@]tool_target[@]-gcc/d" \ -e "@sysdirpattern@" \ -e "/[@]PATCH/d" + +MKSPEC0 = sed \ + -e "s/[@]tool_target[@]/$(TARGET)/g" diff --git a/contrib/crossrpms/rtems4.8/binutils.am b/contrib/crossrpms/rtems4.8/binutils.am index 64f6e680e7..bf0539e77f 100644 --- a/contrib/crossrpms/rtems4.8/binutils.am +++ b/contrib/crossrpms/rtems4.8/binutils.am @@ -20,7 +20,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "/--with-sysroot/d" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/rtems4.8/gcc.am b/contrib/crossrpms/rtems4.8/gcc.am index 08e28d5a92..887941f135 100644 --- a/contrib/crossrpms/rtems4.8/gcc.am +++ b/contrib/crossrpms/rtems4.8/gcc.am @@ -32,7 +32,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/--with-sysroot/d" \ -e "/[@]tool_target[@]-sys-root/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/rtems4.8/gdb.am b/contrib/crossrpms/rtems4.8/gdb.am index 38bc7b881f..fd6ac388b3 100644 --- a/contrib/crossrpms/rtems4.8/gdb.am +++ b/contrib/crossrpms/rtems4.8/gdb.am @@ -20,7 +20,7 @@ $(TARGET)-gdb.spec.in: $(GDB_SUBPACKAGES) Makefile.am $(srcdir)/gdb-sources.add -e "s/[@]GDB_PKGVERS[@]/$(GDB_PKGVERS)/g" \ -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)/g" \ -e "/--with-sysroot/d" \ - > $(TARGET)-gdb.spec.in + | $(MKSPEC0) > $(TARGET)-gdb.spec.in CLEANFILES += $(TARGET)-gdb.spec.in @rpmprefix@$(TARGET)-gdb.spec: $(TARGET)-gdb.spec.in diff --git a/contrib/crossrpms/solaris2.7/binutils.am b/contrib/crossrpms/solaris2.7/binutils.am index af4e65f348..2772db3784 100644 --- a/contrib/crossrpms/solaris2.7/binutils.am +++ b/contrib/crossrpms/solaris2.7/binutils.am @@ -19,7 +19,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ - > $(TARGET)-binutils.spec.in + | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/solaris2.7/gcc.am b/contrib/crossrpms/solaris2.7/gcc.am index b31439bdda..5114102ccb 100644 --- a/contrib/crossrpms/solaris2.7/gcc.am +++ b/contrib/crossrpms/solaris2.7/gcc.am @@ -29,7 +29,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - > $(TARGET)-gcc.spec.in + | $(MKSPEC0) > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in -- cgit v1.2.3