This commit is contained in:
Ralf Corsepius
2006-02-20 14:00:55 +00:00
parent d31a75a1b3
commit b7cd78c1f5
6 changed files with 24 additions and 25 deletions

View File

@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
cat $(LIBS_SUBPACKAGES) | sed \ cat $(LIBS_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-libs.spec.in > $(TARGET)-libs.spec.in
CLEANFILES += $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in
@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \ -e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \
-e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \ -e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \
$(srcdir)/$(TARGET)-libs.spec.in > $@ $(srcdir)/$(TARGET)-libs.spec.in > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
-e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -96,6 +95,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \

View File

@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
cat $(LIBS_SUBPACKAGES) | sed \ cat $(LIBS_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-libs.spec.in > $(TARGET)-libs.spec.in
CLEANFILES += $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in
@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \ -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \ -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
$(srcdir)/$(TARGET)-libs.spec.in > $@ $(srcdir)/$(TARGET)-libs.spec.in > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
-e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +96,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \

View File

@@ -17,13 +17,12 @@ LIBS_SUBPACKAGES += target-libs.add
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
cat $(LIBS_SUBPACKAGES) | sed \ cat $(LIBS_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-libs.spec.in > $(TARGET)-libs.spec.in
CLEANFILES += $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in
@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \ -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \ -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
$(srcdir)/$(TARGET)-libs.spec.in > $@ $(srcdir)/$(TARGET)-libs.spec.in > $@
@@ -49,13 +48,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +83,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
-e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +95,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \

View File

@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
cat $(LIBS_SUBPACKAGES) | sed \ cat $(LIBS_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-libs.spec.in > $(TARGET)-libs.spec.in
CLEANFILES += $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in
@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]MINGW32_VERS[@]/$(MINGW32_VERS)/g" \ -e "s/[@]MINGW32_VERS[@]/$(MINGW32_VERS)/g" \
-e "s/[@]MINGW32_RPMREL[@]/$(MINGW32_RPMREL)/g" \ -e "s/[@]MINGW32_RPMREL[@]/$(MINGW32_RPMREL)/g" \
$(srcdir)/$(TARGET)-libs.spec.in > $@ $(srcdir)/$(TARGET)-libs.spec.in > $@
@@ -42,13 +42,13 @@ W32API_SUBPACKAGES += target-w32api.add
$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am
cat $(W32API_SUBPACKAGES) | sed \ cat $(W32API_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-w32api.spec.in > $(TARGET)-w32api.spec.in
CLEANFILES += $(TARGET)-w32api.spec.in CLEANFILES += $(TARGET)-w32api.spec.in
@rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in @rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \ -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
-e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \ -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
$(srcdir)/$(TARGET)-w32api.spec.in > $@ $(srcdir)/$(TARGET)-w32api.spec.in > $@
@@ -74,13 +74,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -109,9 +109,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "/[@]rpmprefix[@][@]tool_target[@]-libc/d" \
-e "s,^%define[ ]*_cxx[ ]*1,%define _cxx 0," \ -e "s,^%define[ ]*_cxx[ ]*1,%define _cxx 0," \
-e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \
-e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
@@ -122,6 +121,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \

View File

@@ -23,13 +23,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -61,7 +61,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
-e "s/-n @rpmprefix@@tool_target@-gcc//" \ -e "s/-n @rpmprefix@@tool_target@-gcc//" \
@@ -73,6 +72,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \

View File

@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
cat $(LIBS_SUBPACKAGES) | sed \ cat $(LIBS_SUBPACKAGES) | sed \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
> $(TARGET)-libs.spec.in > $(TARGET)-libs.spec.in
CLEANFILES += $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in
@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
sed \ sed \
-e "s/@tool_target@/$(TARGET)/g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]SOLARIS_VERS[@]/$(SOLARIS_VERS)/g" \ -e "s/[@]SOLARIS_VERS[@]/$(SOLARIS_VERS)/g" \
-e "s/[@]SOLARIS_RPMREL[@]/$(SOLARIS_RPMREL)/g" \ -e "s/[@]SOLARIS_RPMREL[@]/$(SOLARIS_RPMREL)/g" \
$(srcdir)/$(TARGET)-libs.spec.in > $@ $(srcdir)/$(TARGET)-libs.spec.in > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
> $(TARGET)-binutils.spec.in > $(TARGET)-binutils.spec.in
CLEANFILES += $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \ -e "/[@]SOURCES[@]/d" \
-e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]_prefix[@],$(prefix),g" \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s,rtems[@]osversion[@],rtems,g" \ -e "s,rtems[@]osversion[@],rtems,g" \
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
-e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +96,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
sed \ sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-e "s/[@]tool_target[@]/$(TARGET)/g" \ -e "s/[@]tool_target[@]/$(TARGET)/g" \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \