PR#1: Build against FlexiBLAS - rpms/qm-vamp-plugins

Iñaki Úcar • 3 years ago

f0a6b51

qm-vamp-plugins-build.patch

file modified

+3 -3

		`@@ -8,16 +8,16 @@`
		`--- a/Makefile`
		`+++ b/Makefile`
		`@@ -1,10 +1,11 @@`
		`- +ATLAS_LIBS ?= -llapack -lcblas`
		`+ +BLAS_LIBS ?= -llapack -lcblas`

		`-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS`
		`- +CFLAGS := -DNDEBUG -fno-exceptions -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS $(ATLAS_CFLAGS) $(CFLAGS)`
		`+ +CFLAGS := -DNDEBUG -fno-exceptions -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS $(BLAS_CFLAGS) $(CFLAGS)`
		`#CFLAGS := -g -Wall`

		`CXXFLAGS := $(CFLAGS)`

		`-LDFLAGS := -shared -Lbuild/linux/i686 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -llapack -lcblas -lf77blas -latlas -lgfortran -Wl,-Bdynamic -lpthread -Wl,-z,defs -Wl,--version-script=vamp-plugin.map`
		`- +LDFLAGS := -shared -lqm-dsp -lvamp-sdk -lpthread -Wl,--version-script=vamp-plugin.map $(ATLAS_LIBS) $(LDFLAGS)`
		`+ +LDFLAGS := -shared -lqm-dsp -lvamp-sdk -lpthread -Wl,--version-script=vamp-plugin.map $(BLAS_LIBS) $(LDFLAGS)`

		`PLUGIN_EXT := .so`

qm-vamp-plugins.spec

file modified

+12 -10

		`@@ -1,6 +1,12 @@`
		`+ %if 0%{?fedora} >= 33`
		`+ %global blaslib flexiblas`
		`+ %else`
		`+ %global blaslib openblas`
		`+ %endif`
		`+`
		`Name: qm-vamp-plugins`
		`Version: 1.7.1`
		`- Release: 12%{?dist}`
		`+ Release: 13%{?dist}`
		`Summary: Vamp audio feature extraction plugin`

		`License: GPLv2+`
		`@@ -15,7 +21,7 @@`
		`# (not intended for upstream)`
		`Patch1: qm-vamp-plugins-unbundle.patch`

		`- BuildRequires: atlas-devel`
		`+ BuildRequires: %{blaslib}-devel`
		`BuildRequires: gcc-c++`
		`BuildRequires: kiss-fft-static`
		`BuildRequires: qm-dsp-static`
		`@@ -47,13 +53,6 @@`


		`%build`
		`- # atlas libraries`
		`- %if 0%{?rhel} >= 7 \|\| 0%{?fedora}`
		`- ATLAS_LIBS="-L%{_libdir}/atlas -ltatlas"`
		`- %else`
		`- ATLAS_LIBS="-L%{_libdir}/atlas -llapack -lcblas"`
		`- %endif`
		`-`
		`# extra cflags used in upstream`
		`%ifarch %{ix86}`
		`EXTRA_CFLAGS="-msse -mfpmath=sse"`
		`@@ -64,7 +63,7 @@`

		`CFLAGS="-I%{_includedir}/qm-dsp $EXTRA_CFLAGS %{?optflags}" \`
		`LDFLAGS="%{?__global_ldflags}" \`
		`- ATLAS_LIBS="$ATLAS_LIBS" \`
		`+ BLAS_LIBS="-l%{blaslib}" \`
		`make %{?_smp_mflags}`


		`@@ -84,6 +83,9 @@`


		`%changelog`
		`+ * Sun Aug 16 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1.7.1-13`
		`+ - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager`
		`+`
		`* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-12`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

This PR is part of a F33 System-Wide Change Proposal that aims to set FlexiBLAS
as the default BLAS/LAPACK manager for all consumers of these APIs. For further
information, see https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager

I kindly ask you to merge this PR and build the package in rawhide and F33. Please,
report any issues you may found in https://bugzilla.redhat.com/show_bug.cgi?id=1860504