[rcssserver] fix build on non-x86 64-bit architectures
Dan Horák
sharkcz at fedoraproject.org
Fri May 27 16:14:00 UTC 2011
commit 44aca577f109c4e3185a2ccc5d80156de3b87dba
Author: Dan Horák <dan at danny.cz>
Date: Fri May 27 18:13:48 2011 +0200
fix build on non-x86 64-bit architectures
ax_boost_base-64bit.patch | 13 +++++++++++++
rcssserver.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/ax_boost_base-64bit.patch b/ax_boost_base-64bit.patch
new file mode 100644
index 0000000..50e70b3
--- /dev/null
+++ b/ax_boost_base-64bit.patch
@@ -0,0 +1,13 @@
+diff -up rcsslogplayer-15.0.0/m4/ax_boost_base.m4.orig rcsslogplayer-15.0.0/m4/ax_boost_base.m4
+--- rcsslogplayer-15.0.0/m4/ax_boost_base.m4.orig 2011-04-04 05:51:26.000000000 +0200
++++ rcsslogplayer-15.0.0/m4/ax_boost_base.m4 2011-05-27 17:30:38.000000000 +0200
+@@ -85,7 +85,8 @@ if test "x$want_boost" = "xyes"; then
+ succeeded=no
+
+ libsubdir="lib"
+- if test "$(uname -m)" = "x86_64"; then
++ ax_arch=`uname -m`
++ if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
+ libsubdir="lib64"
+ fi
+
diff --git a/rcssserver.spec b/rcssserver.spec
index c48e841..1339486 100644
--- a/rcssserver.spec
+++ b/rcssserver.spec
@@ -1,6 +1,6 @@
Name: rcssserver
Version: 15.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Robocup 2D Soccer Simulation Server
Group: Applications/System
@@ -10,6 +10,8 @@ URL: http://sourceforge.net/projects/sserver/
Source0: http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1: %{name}.desktop
+# upstream should update ax_boost_base.m4
+Patch0: ax_boost_base-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake libtool boost-devel zlib-devel
@@ -52,6 +54,7 @@ provide a menu entry for this script.
%prep
%setup -q
+%patch0 -p1 -b .64bit
sed -i.lib \
-e 's|\$ac_boost_path/lib|\$libdir|' \
-e 's|$ac_boost_path_tmp/lib|\$libdir|' \
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
%{_datadir}/applications/*
%changelog
+* Fri May 27 2011 Dan Horák <dan[at]danny.cz> - 15.0.0-2
+- fix build on non-x86 64-bit architectures
+
* Thu May 19 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-1
- Updated to 15.0.0 upstream version
More information about the scm-commits
mailing list