From b3f4cd4f92864ffb46892481bf75fb83b871ff20 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 24 Jul 2011 05:46:18 +0000
Subject: Support rpmbuild --with iconv.

---
 contrib/crossrpms/gcc/build.add   |  1 +
 contrib/crossrpms/gcc/install.add | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'contrib')

diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add
index b6b55b80e7..cedaf4a915 100644
--- a/contrib/crossrpms/gcc/build.add
+++ b/contrib/crossrpms/gcc/build.add
@@ -57,6 +57,7 @@
     %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
 %if %build_newlib
     --enable-newlib-io-c99-formats \
+    %{?with_iconv:--enable-newlib-iconv} \
 %endif
 %if %build_libgcj
     --enable-libgcj \
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index 7a9728dc61..0e314ac21a 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -69,13 +69,22 @@
     rmdir ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits
   fi
 
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
+%if %build_newlib
+%if %{with iconv}
+  # Iconv enabled newlib installs external ccts (target files)
+  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
+    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
+  fi
+%endif
+
+%endif
 %if ! %{with pygdb}
+  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
   if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
     rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
   fi
-%endif
 
+%endif
 %if %build_go
 %if "%{gcc_version}" == "4.6.0"
   # Bug in gcc == 4.6.0: Installs gccgo under bogus name
-- 
cgit v1.2.3