[ice] Add patch to fix build on ARM
Peter Robinson
pbrobinson at fedoraproject.org
Mon Jun 11 23:30:49 UTC 2012
commit ce3c238d9805175b9f260c1161495ebcb79178f7
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Jun 12 00:30:33 2012 +0100
Add patch to fix build on ARM
ice-3.4.2-arm.patch | 11 +++++++++++
ice.spec | 17 +++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/ice-3.4.2-arm.patch b/ice-3.4.2-arm.patch
new file mode 100644
index 0000000..38aa290
--- /dev/null
+++ b/ice-3.4.2-arm.patch
@@ -0,0 +1,11 @@
+--- Ice-3.4.2/cpp/include/IceUtil/Config.h.arm 2012-06-11 19:14:41.558198133 -0400
++++ Ice-3.4.2/cpp/include/IceUtil/Config.h 2012-06-11 19:16:23.535683708 -0400
+@@ -22,7 +22,7 @@
+
+ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \
+ defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \
+- defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
++ defined(__MIPSEL__) || defined(__arm__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
+ # define ICE_LITTLE_ENDIAN
+ #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \
+ defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
diff --git a/ice.spec b/ice.spec
index d525718..2cf17c7 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
Name: ice
Version: 3.4.2
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: ZeroC Object-Oriented middleware
Group: System Environment/Libraries
@@ -48,7 +48,8 @@ Patch6: ice-3.4.2-php54.patch
Patch7: ice-3.4.2-slice2cpp.patch
# See: http://www.zeroc.com/forums/patches/5647-patch-compiling-ice-clang-gcc4-7-a.html
Patch8: ice-3.4.2-gcc47.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# ARM
+Patch9: ice-3.4.2-arm.patch
# Ice doesn't officially support ppc64 at all
ExcludeArch: ppc64
@@ -219,7 +220,9 @@ Tools for developing Ice applications in PHP.
%patch6 -p1 -b .php54
%patch7 -p1 -b .slice2cpp
%patch8 -p1 -b .gcc47
-%{__tar} xf %{SOURCE1}
+%patch9 -p1 -b .arm
+
+tar xf %{SOURCE1}
rm -f ice-3.4.2-man-pages/slice2docbook.1
@@ -245,7 +248,6 @@ rm temp*.png
popd
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}
# Do the basic "make install"
make prefix=%{buildroot} GACINSTALL=yes GAC_ROOT=%{buildroot}%{_prefix}/lib embedded_runpath_prefix="" libsubdir=%{_lib} install
@@ -401,10 +403,6 @@ install -p -m0644 %{SOURCE10} %{buildroot}%{systemddir}
mkdir -p %{buildroot}%{_localstatedir}/lib/icegrid
-%clean
-rm -rf %{buildroot}
-
-
%check
# Minimum check for php extension
LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php_extdir} -d extension=IcePHP.so -m | grep ice
@@ -602,6 +600,9 @@ fi
%changelog
+* Mon Jun 11 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 3.4.2-15
+- Add patch to fix build on ARM
+
* Tue May 29 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-14
- refresh all patches
More information about the scm-commits
mailing list