diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index 2fc5792b9a..95001f4f4b 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -79,8 +79,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index 932bf62f0f..69189522bf 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -80,8 +80,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am index a014d057f2..71d2455ec7 100644 --- a/contrib/crossrpms/freebsd6.0/Makefile.am +++ b/contrib/crossrpms/freebsd6.0/Makefile.am @@ -80,8 +80,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index 9ad17c9244..3f54fba8c0 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -100,8 +100,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ -e "s,^%define[ ]*_cxx[ ]*1,%define _cxx 0," \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am index 74f80d8598..fc805b086b 100644 --- a/contrib/crossrpms/rtems/Makefile.am +++ b/contrib/crossrpms/rtems/Makefile.am @@ -59,8 +59,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e "/--with-sysroot/d" \ -e "/[@]tool_target[@]-sys-root/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index 354dfa2d3a..d9a3a0ef9a 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -80,8 +80,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add -e "/[@]tool_target[@]-newlib/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ -e "/--with-newlib/d" \ - -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ - -e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in