[icu] icu: provide a temporary fix for a FTBFS caused by the fix for BZ681941

Jon Masters jcm at fedoraproject.org
Mon Jan 30 20:57:44 UTC 2012


commit 0f21e444e40bf46b93c4e1cd0e62f513b3166514
Author: Jon Masters <jcm at sherlock.bos.jonmasters.org>
Date:   Mon Jan 30 15:54:43 2012 -0500

    icu: provide a temporary fix for a FTBFS caused by the fix for BZ681941
    
    The existing fix for BZ681941 caused a FTBFS on ARM systems. I have attached
    a detailed summary explaining why this is the case to that BZ.

 icu.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/icu.spec b/icu.spec
index e86c734..6a549d2 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.8.1.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
@@ -65,9 +65,9 @@ CXXFLAGS='%optflags -fno-strict-aliasing'
 %configure --with-data-packaging=library --disable-samples
 #rhbz#225896
 sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
-#rhbz#681491
+#rhbz#681941
 sed -i 's|^LIBS =.*|LIBS = -L../lib -licuuc -lpthread -lm|' i18n/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -licui18n -lc|' io/Makefile
+sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -licui18n -lc -lgcc|' io/Makefile
 sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -lc|' layout/Makefile
 sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -licule -lc|' layoutex/Makefile
 sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../../lib -licutu -licuuc -lc|' tools/ctestfw/Makefile
@@ -140,6 +140,9 @@ make -C source check
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Mon Jan 30 2012 Jon Masters <jcm at jonmasters.org> - 4.8.1.1-2
+- Correct reference to BZ681941, add temporary fix for ARM FTBFS side effect
+
 * Fri Jan 20 2012 Peter Robinson <pbrobinson at fedoraproject.org> -4.8.1.1-1
 - Update to 4.8.1.1
 


More information about the scm-commits mailing list