diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch')
-rw-r--r-- | sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch b/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch deleted file mode 100644 index 8d9d2738c087..000000000000 --- a/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch +++ /dev/null @@ -1,76 +0,0 @@ -From be6c249e7838bd838174db5c2bb98bf63b026b83 Mon Sep 17 00:00:00 2001 -From: François Bissey <frp.bissey@gmail.com> -Date: Tue, 21 Jan 2020 11:24:50 +1300 -Subject: [PATCH] Detect and use LIBM to link libm4ri in all cases. - ---- - Makefile.am | 2 +- - configure.ac | 6 +++++- - m4ri.pc.in | 2 +- - tests/Makefile.am | 2 +- - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e317d06..416d9f1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -58,7 +58,7 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = m4ri.pc - - libm4ri_la_LDFLAGS = -release 0.0.$(RELEASE) -no-undefined --libm4ri_la_LIBADD = $(LIBPNG_LIBADD) -+libm4ri_la_LIBADD = $(LIBPNG_LIBADD) $(LIBM) - - SUBDIRS = . tests - DIST_SUBDIRS = $(SUBDIRS) bench -diff --git a/configure.ac b/configure.ac -index 39de702..520154d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([m4]) - dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O. - AM_PROG_CC_C_O - --AC_PROG_LIBTOOL -+LT_INIT - - AC_PROG_INSTALL - -@@ -26,6 +26,10 @@ if test "$ac_cv_prog_cc_c99" = "no"; then - AC_MSG_ERROR([C99 support is required but not found.]) - fi - -+# Find and set LIBM on the platform. -+LT_LIB_M -+AC_SUBST(LIBM) -+ - # SSE2 support - AC_ARG_ENABLE([sse2], - AS_HELP_STRING([--disable-sse2], [don't use SSE2 instruction set.]), -diff --git a/m4ri.pc.in b/m4ri.pc.in -index 5044de7..07597bd 100644 ---- a/m4ri.pc.in -+++ b/m4ri.pc.in -@@ -7,5 +7,5 @@ Name: M4RI - Description: Dense linear algebra over GF(2). - Version: @PACKAGE_VERSION@ - Requires: @M4RI_USE_PNG_PC@ --Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ -lm -+Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ @LIBM@ - Cflags: -I${includedir} @SIMD_CFLAGS@ @OPENMP_CFLAGS@ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c9839a2..069e360 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -15,7 +15,7 @@ DEFINES = - AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) @OPENMP_CFLAGS@ @PAPI_CFLAGS@ - - STAGEDIR := $(realpath -s $(TOPBUILDDIR)/.libs) --AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri -lm @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install -+AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri $(LIBM) @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install - - test_smallops_SOURCES = test_smallops.c testing.c testing.h - --- -2.10.5 - |