From 9dbea1a791dcb4f99465546096e44c09d02bfa4f Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Apr 08 2020 01:21:47 +0000 Subject: Fix ppc64 build --- diff --git a/liquid-dsp.spec b/liquid-dsp.spec index 3707430..1c3050e 100644 --- a/liquid-dsp.spec +++ b/liquid-dsp.spec @@ -14,11 +14,13 @@ URL: http://liquidsdr.org/ Source0: liquid-dsp-1.3.2.tar.gz # set soname ourselves as upstream doesn't Patch0: soname-version.patch +# Patch configure.ac for ppc64 +Patch1: ppc64-configureac.patch # add autotooling as upstream doesn't -Patch1: autotools.patch +Patch2: autotools.patch # fixes ppc64 altivec, other 64-bit problems. Patch by Dan HorĂ¡k. # https://github.com/jgaeddert/liquid-dsp/pull/136 -Patch2: ppc64.patch +Patch3: ppc64.patch BuildRequires: gcc fftw-libs-single gcovr %description diff --git a/ppc64-configureac.patch b/ppc64-configureac.patch new file mode 100644 index 0000000..a696cb8 --- /dev/null +++ b/ppc64-configureac.patch @@ -0,0 +1,13 @@ +Binary files liquid-dsp.orig/.git/index and liquid-dsp/.git/index differ +diff -urNp liquid-dsp.orig/configure.ac liquid-dsp/configure.ac +--- liquid-dsp.orig/configure.ac 2020-04-07 19:47:16.999978525 -0500 ++++ liquid-dsp/configure.ac 2020-04-07 20:13:23.948011753 -0500 +@@ -191,7 +191,7 @@ else + src/dotprod/src/dotprod_rrrf.av.o \ + src/dotprod/src/dotprod_crcf.av.o \ + src/dotprod/src/sumsq.o" +- ARCH_OPTION="-fno-common -faltivec";; ++ ARCH_OPTION="-fno-common -maltivec";; + armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) + # assume neon instructions are NOT available + MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ diff --git a/ppc64.patch b/ppc64.patch index 0467b70..7aaa508 100644 --- a/ppc64.patch +++ b/ppc64.patch @@ -1,16 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index 1445de97..0e288ce3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -195,7 +195,7 @@ else - src/dotprod/src/dotprod_rrrf.av.o \ - src/dotprod/src/dotprod_crcf.av.o \ - src/dotprod/src/sumsq.o" -- ARCH_OPTION="-fno-common -faltivec";; -+ ARCH_OPTION="-fno-common -maltivec";; - armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) - # assume neon instructions are NOT available - MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ diff --git a/src/dotprod/src/dotprod_crcf.av.c b/src/dotprod/src/dotprod_crcf.av.c index ba40595b..b879e905 100644 --- a/src/dotprod/src/dotprod_crcf.av.c