[urg] - fix build on 64-bit architectures

Dan Horák sharkcz at fedoraproject.org
Tue Sep 7 16:56:55 UTC 2010


commit f0a6c11e6e36f1d4a934f0dbeb9c9f82ff50ff82
Author: Dan Horák <dan at danny.cz>
Date:   Tue Sep 7 18:56:58 2010 +0200

    - fix build on 64-bit architectures

 urg-0.8.7-64bit.patch |   21 +++++++++++++++++++++
 urg.spec              |    8 ++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/urg-0.8.7-64bit.patch b/urg-0.8.7-64bit.patch
new file mode 100644
index 0000000..ff8e30f
--- /dev/null
+++ b/urg-0.8.7-64bit.patch
@@ -0,0 +1,21 @@
+diff -up urg-0.8.7/m4/ax_boost_base.m4.64bit urg-0.8.7/m4/ax_boost_base.m4
+--- urg-0.8.7/m4/ax_boost_base.m4.64bit	2010-09-07 12:29:51.537610582 -0400
++++ urg-0.8.7/m4/ax_boost_base.m4	2010-09-07 12:33:00.987478588 -0400
+@@ -76,10 +76,14 @@ if test "x$want_boost" = "xyes"; then
+ 	AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+ 	succeeded=no
+ 
+-	libsubdir="lib"
+-	if test "$(uname -m)" = "x86_64"; then
++	case "$(uname -m)" in
++	    "x86_64" | "powerpc64" | "sparc64" | "s390x" )
+ 		libsubdir="lib64"
+-	fi
++		;;
++	    *)
++		libsubdir="lib"
++		;;
++	esac
+ 
+ 	dnl first we check the system location for boost libraries
+ 	dnl this location ist chosen if boost libraries are installed with the --layout=system option
diff --git a/urg.spec b/urg.spec
index 493d727..2f480bc 100644
--- a/urg.spec
+++ b/urg.spec
@@ -1,6 +1,6 @@
 Name:           urg
 Version:        0.8.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library to access Hokuyo URG laser range finders
 
 Group:          System Environment/Libraries
@@ -11,7 +11,7 @@ Patch0:         urg-0.8.7-norpath.patch
 Patch1:         urg-0.8.7-boost133.patch
 Patch2:         urg-0.8.7-autoconf259.patch
 Patch3:         urg-0.8.7-noforwdecl.patch
-ExcludeArch:    ppc64
+Patch4:         urg-0.8.7-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf automake libtool
@@ -40,6 +40,7 @@ developing applications that use %{name}.
 %patch1 -p1 -b .boost133
 %patch2 -p1 -b .autoconf259
 %patch3 -p1 -b .noforwdecl
+%patch4 -p1 -b .64bit
 
 %build
 #libtoolize --copy
@@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 07 2010 Dan Horák <dan[at]danny.cz> - 0.8.7-4
+- fix build on 64-bit architectures
+
 * Thu Aug 05 2010 Tim Niemueller <tim at niemueller.de> - 0.8.7-3
 - Rebuild for new Boost
 


More information about the scm-commits mailing list