git: f11a2a6eb6d8 - main - math/m4ri: Improve port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Feb 2025 15:05:27 UTC
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f11a2a6eb6d81a433e51f6f8a8fe730aed6c9ea5 commit f11a2a6eb6d81a433e51f6f8a8fe730aed6c9ea5 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2025-02-08 11:34:30 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2025-02-08 13:51:16 +0000 math/m4ri: Improve port * Don't detect CPU features from build host, rely on CPUTYPE provided by framework * Adjust Makefile to closer follow Porters Handbook PR: 284367 Approved by: portmgr (maintainer timeout, 2 weeks) --- math/m4ri/Makefile | 7 ++++--- math/m4ri/files/patch-configure.ac | 11 +++++++++++ math/m4ri/files/patch-m4ri.pc.in | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/math/m4ri/Makefile b/math/m4ri/Makefile index 0017d57befc8..70537b11c5cd 100644 --- a/math/m4ri/Makefile +++ b/math/m4ri/Makefile @@ -1,6 +1,6 @@ PORTNAME= M4RI -PORTVERSION= 20240729 DISTVERSIONPREFIX= release- +DISTVERSION= 20240729 CATEGORIES= math MAINTAINER= thierry@FreeBSD.org @@ -15,10 +15,11 @@ USE_GITHUB= yes GH_ACCOUNT= malb GH_PROJECT= ${PORTNAME:tl} -USES= autoreconf libtool localbase pkgconfig +USES= autoreconf libtool:ldflags localbase pathfix pkgconfig +USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_LDCONFIG= yes + INSTALL_TARGET= install-strip .if defined(MAINTAINER_MODE) diff --git a/math/m4ri/files/patch-configure.ac b/math/m4ri/files/patch-configure.ac new file mode 100644 index 000000000000..37760f5ddb93 --- /dev/null +++ b/math/m4ri/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2025-01-26 11:45:07 UTC ++++ configure.ac +@@ -39,7 +39,7 @@ AS_IF([test "x$enable_sse2" != "xno"], [ + if test "$m4ri_wrapword" = "yes"; then + AC_MSG_ERROR([SSE2 cannot be supported when wrapping word in a C++ class.]) + fi +- AX_EXT() ++# AX_EXT() + ]) + if test x"$ax_cv_have_sse2_ext" = x"yes"; then + M4RI_HAVE_SSE2=1 diff --git a/math/m4ri/files/patch-m4ri.pc.in b/math/m4ri/files/patch-m4ri.pc.in index 0537eda68971..1eac9e26ea31 100644 --- a/math/m4ri/files/patch-m4ri.pc.in +++ b/math/m4ri/files/patch-m4ri.pc.in @@ -1,8 +1,8 @@ ---- m4ri.pc.in.orig 2024-07-29 12:30:45 UTC +--- m4ri.pc.in.orig 2025-01-26 11:44:34 UTC +++ m4ri.pc.in @@ -8,4 +8,4 @@ Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ @LIBM@ @LIBPNG_L Version: @PACKAGE_VERSION@ Requires: @M4RI_USE_PNG_PC@ Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ @LIBM@ @LIBPNG_LIBADD@ -Cflags: -I${includedir} @SIMD_CFLAGS@ @OPENMP_CFLAGS@ @LIBPNG_CFLAGS@ -+Cflags: -I${includedir} @SIMD_FLAGS@ @OPENMP_CFLAGS@ @LIBPNG_CFLAGS@ ++Cflags: -I${includedir} @OPENMP_CFLAGS@ @LIBPNG_CFLAGS@