[drumkv1] Fix FTBFS on secondary 64bit arches
Yaakov Selkowitz
yselkowitz at fedoraproject.org
Tue Jul 8 23:04:22 UTC 2014
commit b199d359ed359b5a826ca2b71bea703e54033dec
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Tue Jul 8 17:26:26 2014 -0500
Fix FTBFS on secondary 64bit arches
drumkv1-0.5.0-lib64.patch | 27 +++++++++++++++++++++++++++
drumkv1.spec | 9 ++++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/drumkv1-0.5.0-lib64.patch b/drumkv1-0.5.0-lib64.patch
new file mode 100644
index 0000000..3b59371
--- /dev/null
+++ b/drumkv1-0.5.0-lib64.patch
@@ -0,0 +1,27 @@
+aarch64, ppc64, s390x also use lib64
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -167,6 +167,8 @@ ac_topdirs="/usr/share /usr/lib"
+ if test "x$ac_arch" = "xx86_64"; then
+ CFLAGS="-fPIC $CFLAGS"
+ CPPFLAGS="-fPIC $CPPFLAGS"
++fi
++if test -d /usr/lib64; then
+ ac_topdirs="$ac_topdirs /usr/lib64"
+ fi
+
+@@ -199,11 +201,10 @@ for X in $ac_with_paths; do
+ CPPFLAGS="-I$X/include $CPPFLAGS"
+ ac_incpath="$X/include $ac_incpath"
+ fi
+- if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then
++ if test -d $X/lib64; then
+ LIBS="-L$X/lib64 $LIBS"
+ ac_libs="-L$X/lib64 $ac_libs"
+- fi
+- if test -d $X/lib; then
++ elif test -d $X/lib; then
+ LIBS="-L$X/lib $LIBS"
+ ac_libs="-L$X/lib $ac_libs"
+ fi
diff --git a/drumkv1.spec b/drumkv1.spec
index b4d8df5..73c1275 100644
--- a/drumkv1.spec
+++ b/drumkv1.spec
@@ -1,11 +1,12 @@
Summary: An old-school drum-kit sampler
Name: drumkv1
Version: 0.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://sourceforge.net/projects/%{name}
Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
+Patch0: drumkv1-0.5.0-lib64.patch
BuildRequires: alsa-lib-devel
BuildRequires: jack-audio-connection-kit-devel
@@ -13,6 +14,7 @@ BuildRequires: libsndfile-devel
BuildRequires: qt4-devel
BuildRequires: lv2-devel
BuildRequires: desktop-file-utils
+BuildRequires: autoconf
Requires: hicolor-icon-theme
%description
@@ -29,6 +31,8 @@ An LV2 plugin of the %{name} synth
%prep
%setup -q
+%patch0 -p1
+autoconf -f
sed -i -e 's|-ffast-math|-ffast-math %{optflags} -fPIC |' %{name}_lv2.pro
sed -i -e 's|-ffast-math|-ffast-math %{optflags} -fPIC |' %{name}_jack.pro
# correct handling of arch for 64-bit arches
@@ -71,6 +75,9 @@ fi
%{_libdir}/lv2/%{name}.lv2/
%changelog
+* Tue Jul 08 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.5.0-2
+- Fix FTBFS on secondary 64bit arches
+
* Tue Jul 08 2014 Brendan Jones <brendan.jones.it at gmail.com> 0.5.0-1
- Update to 0.5.0
More information about the scm-commits
mailing list