[icu/f13] Added conditionals for arm builds

Paul Whalen pwhalen at fedoraproject.org
Wed Jun 8 19:57:36 UTC 2011


commit 5fe685a7556af6d06d83ee71493aea7b03d57d3c
Author: Paul Whalen <paul.whalen at senecac.on.ca>
Date:   Tue Jun 7 16:17:32 2011 -0400

    Added conditionals for arm builds

 icu.spec |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/icu.spec b/icu.spec
index b01dd70..b27f754 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -17,6 +17,8 @@ Patch3:  icu.6995.kannada.patch
 Patch4:  icu.icu7039.badextract.patch
 Patch5:  icu.6969.pkgdata.patch
 Patch6:  icu.XXXX.buildfix.patch
+#ARM build fix from http://bugs.gentoo.org/275769
+Patch7:  icu.XXXX.armassembler.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -62,10 +64,18 @@ BuildArch: noarch
 %patch4 -p1 -b .icu7039.badextract.patch
 %patch5 -p0 -b .icu.6969.pkgdata.patch
 %patch6 -p1 -b .icu.XXXX.buildfix.patch
+%ifarch %arm
+%patch7 -p0
+%endif
 
 %build
 cd source
 autoconf
+%ifarch %{arm}
+export CFLAGS="-O0"
+export CXXFLAGS="-O0"
+%endif
+
 %configure --with-data-packaging=library --disable-samples
 #rhbz#225896
 sed -i -- "s/-nodefaultlibs -nostdlib//" config/mh-linux
@@ -83,7 +93,11 @@ sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 
 %check
+%ifnarch %{arm}
 make -C source check
+%else
+make makeBigEndian=FALSE -C source check
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Jun 07 2011 Paul Whalen <paul.whalen at senecac.on.ca> - 4.2.1-9
+- Added conditionals for arm builds
+
 * Wed Dec 02 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-8
 - Resolves: rhbz#543386 update icu-config
 


More information about the scm-commits mailing list