summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-07-09 05:22:06 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-07-09 05:22:06 +0000
commita650ebb1f5b7d10b500ec4e992b0de8f43bbb871 (patch)
tree0dd59445cfde68569b57dbe4a6bfcc4930ddc767
parentSync. (diff)
downloadrtems-a650ebb1f5b7d10b500ec4e992b0de8f43bbb871.tar.bz2
Sync from freebsd6.1
-rw-r--r--contrib/crossrpms/solaris2.7/gcc.am39
-rw-r--r--contrib/crossrpms/solaris2.7/sparc/Makefile.am40
-rw-r--r--contrib/crossrpms/solaris2.7/sparc/binutils-sources.add2
3 files changed, 43 insertions, 38 deletions
diff --git a/contrib/crossrpms/solaris2.7/gcc.am b/contrib/crossrpms/solaris2.7/gcc.am
new file mode 100644
index 0000000000..839e6ae202
--- /dev/null
+++ b/contrib/crossrpms/solaris2.7/gcc.am
@@ -0,0 +1,39 @@
+EXTRA_DIST += $(srcdir)/../gcc-prep.add
+EXTRA_DIST += $(srcdir)/gcc-sources.add
+
+GCC_OPTS =
+
+GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
+GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
+GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
+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
+ cat $(GCC_SUBPACKAGES) | sed \
+ -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
+ -e "/[@]SOURCES[@]/d" \
+ -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
+ -e "/[@]PREP[@]/d" \
+ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
+ -e "/[@]tool_target[@]-newlib/d" \
+ -e "/[@]tool_target[@]-w32api-sys-root/d" \
+ -e "/--with-newlib/d" \
+ > $(TARGET)-gcc.spec.in
+CLEANFILES += $(TARGET)-gcc.spec.in
+
+@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+ $(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
+noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
+
+EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index 92f8a755e2..8c34aebcbb 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -35,41 +35,5 @@ include ../binutils.am
GCC_VERS = 4.1.1
GCC_RPMREL = @VERSION@
-GCC_OPTS = --languages=c,cxx,f95
-EXTRA_DIST += ../gcc-prep.add
-EXTRA_DIST += gcc-sources.add
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-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
- cat $(GCC_SUBPACKAGES) | sed \
- -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
- -e "/[@]SOURCES[@]/d" \
- -e "/[@]PREP[@]/r $(srcdir)/gcc-prep.add" \
- -e "/[@]PREP[@]/d" \
- -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
- -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
- -e "/[@]tool_target[@]-newlib/d" \
- -e "/[@]tool_target[@]-w32api-sys-root/d" \
- -e "/--with-newlib/d" \
- > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
-@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
- $(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
+include ../gcc.am
+GCC_OPTS += --languages=c,cxx,f95
diff --git a/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add b/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add
index 1bce486cf2..06414bc9b8 100644
--- a/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add
+++ b/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add
@@ -1,3 +1,5 @@
Source0: ftp://ftp.gnu.org/pub/binutils/binutils-%{binutils_version}.tar.bz2
%{?_without_sources:NoSource: 0}
+%if "%{binutils_version}" == "2.16.1"
Patch0: binutils-2.16.1-rtems-20050708.diff
+%endif