git: e1b7215897c0 - 2024Q4 - math/cminpack: fix plist on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Dec 2024 10:49:04 UTC
The branch 2024Q4 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e1b7215897c06a5a0837d7fcc51e118e94afa021
commit e1b7215897c06a5a0837d7fcc51e118e94afa021
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-12-25 09:32:45 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-26 10:48:41 +0000
math/cminpack: fix plist on armv7
Same error as on powerpc. Add some explanation as to what is going on.
Approved by: portmgr (build fix blanket)
MFH: 2024Q4
(cherry picked from commit 7085810496269c2d2b6ab30e4dc37a8eaae521ac)
---
math/cminpack/Makefile | 8 +++++---
math/cminpack/pkg-plist | 8 ++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/math/cminpack/Makefile b/math/cminpack/Makefile
index 60579256c075..757f75477b79 100644
--- a/math/cminpack/Makefile
+++ b/math/cminpack/Makefile
@@ -21,10 +21,12 @@ OPTIONS_DEFINE= EXAMPLES
.include <bsd.port.options.mk>
-.if ${ARCH:Mpowerpc*}
-PLIST_SUB+= NOT_POWERPC="@comment "
+# libcminpackld is only built on platforms where
+# sizeof(long double) > sizeof(double)
+.if ${ARCH:Mpowerpc*} || ${ARCH:Marmv?}
+PLIST_SUB+= LONG_DOUBLE="@comment "
.else
-PLIST_SUB+= NOT_POWERPC=""
+PLIST_SUB+= LONG_DOUBLE=""
.endif
diff --git a/math/cminpack/pkg-plist b/math/cminpack/pkg-plist
index 43939cff49b5..1f673e80c0a3 100644
--- a/math/cminpack/pkg-plist
+++ b/math/cminpack/pkg-plist
@@ -3,14 +3,14 @@ include/cminpack-1/minpack.h
lib/libcminpack.so
lib/libcminpack.so.1
lib/libcminpack.so.1.3.11
-%%NOT_POWERPC%%lib/libcminpackld.so
-%%NOT_POWERPC%%lib/libcminpackld.so.1
-%%NOT_POWERPC%%lib/libcminpackld.so.1.3.11
+%%LONG_DOUBLE%%lib/libcminpackld.so
+%%LONG_DOUBLE%%lib/libcminpackld.so.1
+%%LONG_DOUBLE%%lib/libcminpackld.so.1.3.11
lib/libcminpacks.so
lib/libcminpacks.so.1
lib/libcminpacks.so.1.3.11
libdata/pkgconfig/cminpack.pc
-%%NOT_POWERPC%%libdata/pkgconfig/cminpackld.pc
+%%LONG_DOUBLE%%libdata/pkgconfig/cminpackld.pc
libdata/pkgconfig/cminpacks.pc
%%DATADIR%%/CMinpackConfig-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/CMinpackConfig.cmake