[synthv1] Fix FTBFS on aarch64, ppc64, s390x (#1110892)
Peter Robinson
pbrobinson at fedoraproject.org
Thu Jul 3 08:51:32 UTC 2014
commit 9025e71efb4b5904c17d3fb71aed2394a0cba9b5
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Jul 3 09:51:34 2014 +0100
Fix FTBFS on aarch64, ppc64, s390x (#1110892)
synthv1-0.4.1-lib64.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++
synthv1.spec | 8 +++++-
2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/synthv1-0.4.1-lib64.patch b/synthv1-0.4.1-lib64.patch
new file mode 100644
index 0000000..efa651c
--- /dev/null
+++ b/synthv1-0.4.1-lib64.patch
@@ -0,0 +1,54 @@
+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
+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/synthv1.spec b/synthv1.spec
index 509582e..45e653f 100644
--- a/synthv1.spec
+++ b/synthv1.spec
@@ -1,9 +1,10 @@
Summary: A 4-oscillator subtractive polyphonic synthesizer
Name: synthv1
Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://sourceforge.net/projects/%{name}
Source0: http://downloads.sourceforge.net/project/%{name}/0.1.0/%{name}-%{version}.tar.gz
+Patch0: synthv1-0.4.1-lib64.patch
License: GPLv2+
Group: Applications/Multimedia
Requires: hicolor-icon-theme
@@ -28,6 +29,8 @@ An LV2 plugin of the synthv1 subtractive synthesizer
%prep
%setup -q
+%patch0 -p1
+autoconf -f
sed -i -e 's|-msse -mfpmath=sse -ffast-math|%{optflags} -fPIC|' synthv1_lv2.pro
sed -i -e 's|-msse -mfpmath=sse -ffast-math|%{optflags} -fPIC|' synthv1_jack.pro
@@ -68,6 +71,9 @@ fi
%{_libdir}/lv2/%{name}.lv2/
%changelog
+* Wed Jun 18 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.4.1-3
+- Fix FTBFS on aarch64, ppc64, s390x (#1110892)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list