Import changes from HEAD.

5 files changed, 32 insertions, 4 deletions

diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add
index 09f3420891..899410e3ea 100644
--- a/contrib/crossrpms/gcc/build.add
+++ b/contrib/crossrpms/gcc/build.add
@@ -32,7 +32,8 @@
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
   CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
 %else
-  CC="%{__cc} ${RPM_OPT_FLAGS}" \
+# gcc is not ready to be compiled with -std=gnu99
+  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
 %endif
   ../gcc-%{gcc_pkgvers}/configure \
     --prefix=%{_prefix} \
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index bde2f438ed..2341c5a2a2 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -30,7 +30,7 @@ BuildRequires:  gmp-devel >= 4.1
 BuildRequires:  %{_host_rpmprefix}gmp-devel
 BuildRequires:  %{_host_rpmprefix}mpfr-devel
 %endif
-%if "%{?fedora}" >= "8"
+%if 0%{?fedora} >= 8
 BuildRequires:  mpfr-devel >= 2.3.0
 %endif
 %if "%{?suse}" > "10.3"
@@ -50,7 +50,7 @@ BuildRequires:  @rpmprefix@@tool_target@-gcc
 BuildRequires:	flex bison
 %if %build_f95
 BuildRequires:	gmp-devel >= 4.1
-%if "%{?fedora}" >= "8"
+%if 0%{?fedora} >= 8
 BuildRequires:  mpfr-devel >= 2.2.1
 %endif
 %endif
diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add
index 4934b23374..4413603897 100644
--- a/contrib/crossrpms/gcc/prep.add
+++ b/contrib/crossrpms/gcc/prep.add
@@ -25,7 +25,7 @@
 %endif
 
 %if %build_objc
-%setup -T -D -n %{name}-%{version} -a5
+%setup -q -T -D -n %{name}-%{version} -a5
 %{?PATCH5:%patch5 -p0}
 %endif
 
diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add
index 002ecff610..b6014fd66a 100644
--- a/contrib/crossrpms/gcc/rpm-install.add
+++ b/contrib/crossrpms/gcc/rpm-install.add
@@ -47,3 +47,26 @@ EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 
+
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+  b=$(basename $a)
+  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post 
+%define __debug_install_post . ./debug_install_post
+
+
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 04f40e6097..042b72757e 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -44,6 +44,10 @@ GNU cc compiler for @tool_target@.
 %endif
 %endif
 
+%if "%{gcc_version}" >= "4.3.0"
+%dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed
+%endif
+
 %dir %{gccexec}
 %dir %{gccexec}/@tool_target@
 %dir %{gccexec}/@tool_target@/%{gcc_version}