Sync with cvs-HEAD.

3 files changed, 28 insertions, 11 deletions

diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index f8a5bf0149..f1691b2106 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -24,7 +24,14 @@
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext}
@@ -46,10 +53,8 @@
   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
 %endif
 
-%if %build_fortran
-#  # Bug in gcc-4.0.0pre
-#  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran
-%endif
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext}
@@ -65,12 +70,12 @@
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
 %if %build_newlib
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/@tool_target@/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -93,7 +98,7 @@
   echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
 
   TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add
index ae480de8d0..26ddf1b7b9 100644
--- a/contrib/crossrpms/gcc/prep.add
+++ b/contrib/crossrpms/gcc/prep.add
@@ -40,6 +40,9 @@ cd newlib-%{newlib_version}
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 %endif
 
 %if 0%{?_build_mpfr}
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
index c6fc58db03..0ea7735457 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -2,31 +2,33 @@
 # ==============================================================
 # @rpmprefix@@tool_target@-gcj
 # ==============================================================
-%package -n @rpmprefix@@tool_target@-gcj
+%package -n @rpmprefix@@tool_target@-gcc-gcj
 Summary:        Java support (gcj) for @tool_target@-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Provides:	@rpmprefix@@tool_target@-gcc-gcj = %{gcc_rpmvers}-%{release}
 
 %if %build_infos
 Requires:       @rpmprefix@gcc-gcj-common
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
-%description -n @rpmprefix@@tool_target@-gcj
+%description -n @rpmprefix@@tool_target@-gcc-gcj
 RTEMS is an open source operating system for embedded systems.
 
 This is the gcc/java compiler for @tool_target@
 
-%files -n @rpmprefix@@tool_target@-gcj -f build/files.gcj
+%files -n @rpmprefix@@tool_target@-gcc-gcj -f build/files.gcj
 %defattr(-,root,root)
+%sysdir %{_bindir}
 %{_bindir}/@tool_target@-gcj%{_exeext}
 %{_bindir}/@tool_target@-jcf-dump%{_exeext}
 %{_bindir}/@tool_target@-jv-scan%{_exeext}
 %{_bindir}/@tool_target@-gcjh%{_exeext}
 %{_bindir}/@tool_target@-*jar%{_exeext}
 
+%sysdir %{_mandir}
+%sysdir %{_mandir}/man1
 %{_mandir}/man1/@tool_target@-*jar.1*
 %{_mandir}/man1/@tool_target@-gcj*.1*
 %{_mandir}/man1/@tool_target@-jv-*.1*
@@ -39,10 +41,17 @@ This is the gcc/java compiler for @tool_target@
 %{_mandir}/man1/@tool_target@-rmi*.1*
 %endif
 
+%sysdir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/@tool_target@
 %dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
 %{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext}
 %{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
 
+%sysdir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/@tool_target@
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+
 %endif
+