commit: f6f7751c4da8814e15108b87c079e0312c2e6cfd Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat Aug 7 12:20:21 2021 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 12:55:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f7751c
sci-libs/fflas-ffpack: fix linking with slibtool. I've backported the patch from upstream PR 339 to fix this issue in the release tarball. I had intended to wait for an upstream comment... but we might be waiting a while. Thanks to orbea for debugging and fixing the problem! Closes: https://bugs.gentoo.org/787746 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild | 1 + .../fflas-ffpack-2.4.3-fix-internal-linking.patch | 70 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild index de1d816c146..a4de61200a1 100644 --- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild +++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild @@ -29,6 +29,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" "${FILESDIR}/${P}-no-test-echelon.patch" + "${FILESDIR}/${P}-fix-internal-linking.patch" ) pkg_pretend() { diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch new file mode 100644 index 00000000000..5f085554c33 --- /dev/null +++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch @@ -0,0 +1,70 @@ +From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <[email protected]> +Date: Sat, 7 Aug 2021 08:14:44 -0400 +Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal + linking. + +This is just, + + https://github.com/linbox-team/fflas-ffpack/pull/339 + +but rebased onto the old release tarball. +--- + fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am +index 8c56746..449f6e4 100644 +--- a/fflas-ffpack/interfaces/libs/Makefile.am ++++ b/fflas-ffpack/interfaces/libs/Makefile.am +@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs + + AM_CXXFLAGS = @DEFAULT_CFLAGS@ + AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field +-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS) + #AM_LDFLAGS=-static + + +@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \ + fflas_L3_inst.C \ + fflas_L3_inst_implem.inl + +-libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ +- -no-undefined ++libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) ++libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined + + libffpack_la_SOURCES= ffpack_inst.C \ + ffpack_inst_implem.inl +-libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ +- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la +- +-EXTRA_libffpack_la_DEPENDENCIES= libfflas.la ++libffpack_la_LIBADD= libfflas.la ++libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined + + libfflas_c_la_SOURCES=fflas_lvl1.C \ + fflas_lvl2.C \ + fflas_lvl3.C \ + fflas_sparse.C + #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED +-libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ +- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la +- +-EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la ++libfflas_c_la_LIBADD= libfflas.la ++libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined + + libffpack_c_la_SOURCES=ffpack.C + #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED +-libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ +- -no-undefined -lfflas -lffpack +-EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la ++libffpack_c_la_LIBADD= libffpack.la ++libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined + + + EXTRA_DIST=c_libs.doxy +-- +2.31.1 +
