[flush/f14/master] fix build on non-x86 64-bit architectures
Dan Horák
sharkcz at fedoraproject.org
Mon Mar 21 08:12:13 UTC 2011
commit ea18b371f5e6bcd82713f73f64e0b818046b30d1
Author: Dan Horák <dan at danny.cz>
Date: Mon Mar 21 09:10:26 2011 +0100
fix build on non-x86 64-bit architectures
flush-0.9.10-64bit.patch | 33 +++++++++++++++++++++++++++++++++
flush.spec | 8 +++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/flush-0.9.10-64bit.patch b/flush-0.9.10-64bit.patch
new file mode 100644
index 0000000..81c9a2d
--- /dev/null
+++ b/flush-0.9.10-64bit.patch
@@ -0,0 +1,33 @@
+From 12a503ee42f956fa8a32e8f64561e1165a01f972 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Fri, 24 Dec 2010 19:05:47 +0100
+Subject: [PATCH] accept also non-x86 64-bit architectures
+
+---
+ m4/ax_boost_base.m4 | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
+index ec23a0a..c5b6812 100644
+--- a/m4/ax_boost_base.m4
++++ b/m4/ax_boost_base.m4
+@@ -84,13 +84,14 @@ if test "x$want_boost" = "xyes"; then
+ AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+ succeeded=no
+
+- dnl On x86_64 systems check for system libraries in both lib64 and lib.
++ dnl On 64-bit systems check for system libraries in both lib64 and lib.
+ dnl The former is specified by FHS, but e.g. Debian does not adhere to
+ dnl this (as it rises problems for generic multi-arch support).
+ dnl The last entry in the list is chosen by default when no libraries
+ dnl are found, e.g. when only header-only libraries are installed!
+ libsubdirs="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
+ libsubdirs="lib64 lib lib64"
+ fi
+
+--
+1.7.3.4
+
diff --git a/flush.spec b/flush.spec
index 7c24177..9759f11 100644
--- a/flush.spec
+++ b/flush.spec
@@ -1,6 +1,6 @@
Name: flush
Version: 0.9.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK-based BitTorrent client
License: GPLv3+
@@ -10,6 +10,8 @@ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{
Source1: %{name}.desktop
Patch0: %{name}-dbus1.patch
Patch1: %{name}-dbus2.patch
+# https://sourceforge.net/tracker/?func=detail&aid=3231235&group_id=249175&atid=1127117
+Patch2: %{name}-0.9.10-64bit.patch
BuildRequires: bison-devel
BuildRequires: flex
@@ -46,6 +48,7 @@ Features:
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
autoreconf -ivf
@@ -95,5 +98,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Mar 21 2011 Dan Horák <dan[at]danny.cz> - 0.9.10-2
+- fix build on non-x86 64-bit architectures
+
* Mon Feb 7 2011 Oksana Kurysheva <okurysheva at yahoo.com> - 0.9.10-1
- initial build for Fedora
More information about the scm-commits
mailing list