summaryrefslogtreecommitdiffstats
path: root/scripts/gccnewlib
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/gccnewlib')
-rw-r--r--scripts/gccnewlib/Makefile.am22
-rw-r--r--scripts/gccnewlib/Makefile.in8
-rw-r--r--scripts/gccnewlib/gccnewlib.spec.in56
3 files changed, 64 insertions, 22 deletions
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 21d17de771..c3f6f467d7 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -1,33 +1,35 @@
+## $Id$
+
AUTOMAKE_OPTIONS = foreign
-MKGCCNEWLIBSPEC = $(SHELL) ../mkgccnewlibspec
+MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
MKGCCNEWLIBSPEC_DEPS = \
- ../mkgccnewlibspec gccnewlib.spec.in ../setup.cache
+ $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i386-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sparc-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i960-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+ $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
TEMPLATES = \
gccnewlib.spec.in
diff --git a/scripts/gccnewlib/Makefile.in b/scripts/gccnewlib/Makefile.in
index ca3c797e44..3491b8bb2b 100644
--- a/scripts/gccnewlib/Makefile.in
+++ b/scripts/gccnewlib/Makefile.in
@@ -77,7 +77,7 @@ MKGCCNEWLIBSPEC_DEPS = ../mkgccnewlibspec gccnewlib.spec.in ../setup.cache
TEMPLATES = gccnewlib.spec.in
-RPM_SPECS_DATA = i386-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec hppa1.1-rtems-$(GCCNEWLIBVERS).spec
+RPM_SPECS_DATA = i386-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec sh-rtemself-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec hppa1.1-rtems-$(GCCNEWLIBVERS).spec
noinst_DATA = $(TEMPLATES)
@@ -219,6 +219,9 @@ i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
+sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+ $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtemself
+
powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
@@ -228,6 +231,9 @@ sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
+m68k-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+ $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtemself
+
mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in
index f2bc2ce252..8394c7bd9c 100644
--- a/scripts/gccnewlib/gccnewlib.spec.in
+++ b/scripts/gccnewlib/gccnewlib.spec.in
@@ -74,17 +74,46 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
make prefix=$RPM_BUILD_ROOT/opt/rtems install
cd @target_alias@/newlib
make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
-# gzip info files
+
+ # cd back to build/
+ cd ../..
+
+ # gzip info files
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
-
+
+ rm -f files
+
+ # collect c++ headers
+ if test -d $RPM_BUILD_ROOT/opt/rtems/include/g++-3; then
+ find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
+ -type d | \
+ sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
+ find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
+ \( -type f -o -type l \) | \
+ sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
+ fi
+
+ # collect target gcc-lib
if test -d "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"; \
then
- find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type d | \
- sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" > files.gcc-lib
- find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type f | \
- sed -e "s,^$RPM_BUILD_ROOT,,g" >> files.gcc-lib
+ find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
+ -type d | sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
+ find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
+ \( -type f -o -type l \) \
+ | sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
+ fi
+
+ # collect target files
+ if test -d "$RPM_BUILD_ROOT/opt/rtems/@target_alias@"; \
+ then
+ find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
+ -type d | \
+ sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
+ find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
+ \( -type f -o -type l \) | \
+ sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
fi
%post
@@ -107,7 +136,7 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
done
fi
-%files -f files.g++ -f files.gcc-lib
+%files -f build/files
%docdir /opt/rtems/info
%doc /opt/rtems/info/dir
%doc /opt/rtems/info/chill.info*
@@ -126,18 +155,23 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
%dir /opt/rtems/bin
/opt/rtems/bin/cpp
+/opt/rtems/bin/jv-scan
+/opt/rtems/bin/gcov
+/opt/rtems/bin/jcf-dump
+/opt/rtems/bin/gcjh
/opt/rtems/bin/@target_alias@-c++
/opt/rtems/bin/@target_alias@-g++
/opt/rtems/bin/@target_alias@-gcc
/opt/rtems/bin/@target_alias@-gcj
+/opt/rtems/bin/@target_alias@-chill
+/opt/rtems/bin/@target_alias@-g77
+/opt/rtems/bin/@target_alias@-protoize
+/opt/rtems/bin/@target_alias@-unprotoize
%dir /opt/rtems/lib
/opt/rtems/lib/libiberty*
-%dir /opt/rtems/lib/include
+%dir /opt/rtems/include
%dir /opt/rtems/lib/gcc-lib
%dir /opt/rtems/lib/gcc-lib/@target_alias@
-# /opt/rtems/@target_alias@/include
-# /opt/rtems/@target_alias@/sys-include
-/opt/rtems/@target_alias@/lib
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 16:31:10 +0000