git: a69dfa2b3f30 - main - devel/glaze: update 1.9.5 → 1.9.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Dec 2023 18:30:03 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a69dfa2b3f305ccc98667fdb5f6d3de86d71390b
commit a69dfa2b3f305ccc98667fdb5f6d3de86d71390b
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-12-15 09:42:05 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-12-15 18:29:59 +0000
devel/glaze: update 1.9.5 → 1.9.7
Reported by: portscout
---
devel/glaze/Makefile | 10 ++++++++--
devel/glaze/distinfo | 6 +++---
devel/glaze/files/patch-include_glaze_api_lib.hpp | 11 +++++++++++
devel/glaze/files/patch-tests_CMakeLists.txt | 13 +++++++++++++
4 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/devel/glaze/Makefile b/devel/glaze/Makefile
index 60a714ad5306..9d0e906cbe01 100644
--- a/devel/glaze/Makefile
+++ b/devel/glaze/Makefile
@@ -1,6 +1,6 @@
PORTNAME= glaze
DISTVERSIONPREFIX= v
-DISTVERSION= 1.9.5
+DISTVERSION= 1.9.7
CATEGORIES= devel textproc
MAINTAINER= yuri@FreeBSD.org
@@ -10,12 +10,18 @@ WWW= https://github.com/stephenberry/glaze
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+TEST_DEPENDS= ut>0:devel/ut
+
USES= cmake:testing compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= stephenberry
-CMAKE_OFF= BUILD_TESTING # tests fail to run due to https://github.com/stephenberry/glaze/issues/619
+CMAKE_OFF= BUILD_TESTING
+CMAKE_ARGS= -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS
+CMAKE_TESTING_ARGS= -DFREEBSD_STAGEDIR_PREFIX=${STAGEDIR}${DATADIR}
+
+LDFLAGS+= -pthread
NO_ARCH= yes
diff --git a/devel/glaze/distinfo b/devel/glaze/distinfo
index 2bab1112fa8b..7f0c9a8df028 100644
--- a/devel/glaze/distinfo
+++ b/devel/glaze/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702412481
-SHA256 (stephenberry-glaze-v1.9.5_GH0.tar.gz) = 3800fa7283a1d4e5bd2c746fe9e268d2f8af76d3a75be7318b2084f38f529c7f
-SIZE (stephenberry-glaze-v1.9.5_GH0.tar.gz) = 241902
+TIMESTAMP = 1702614559
+SHA256 (stephenberry-glaze-v1.9.7_GH0.tar.gz) = 59dd58e60448c337469bee359a2d07af5ac86412ad97dbc6ee9a24e8710f1209
+SIZE (stephenberry-glaze-v1.9.7_GH0.tar.gz) = 244359
diff --git a/devel/glaze/files/patch-include_glaze_api_lib.hpp b/devel/glaze/files/patch-include_glaze_api_lib.hpp
new file mode 100644
index 000000000000..3303f1be3e65
--- /dev/null
+++ b/devel/glaze/files/patch-include_glaze_api_lib.hpp
@@ -0,0 +1,11 @@
+--- include/glaze/api/lib.hpp.orig 2023-12-15 09:23:51 UTC
++++ include/glaze/api/lib.hpp
+@@ -29,7 +29,7 @@
+ #include <dlfcn.h>
+ #define SHARED_LIBRARY_EXTENSION ".dylib"
+ #define SHARED_LIBRARY_PREFIX "lib"
+-#elif __linux__
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #define SHARED_LIBRARY_EXTENSION ".so"
+ #define SHARED_LIBRARY_PREFIX "lib"
diff --git a/devel/glaze/files/patch-tests_CMakeLists.txt b/devel/glaze/files/patch-tests_CMakeLists.txt
new file mode 100644
index 000000000000..3b521a42b23b
--- /dev/null
+++ b/devel/glaze/files/patch-tests_CMakeLists.txt
@@ -0,0 +1,13 @@
+- correct the directory where to find glaze for testing
+
+--- tests/CMakeLists.txt.orig 2023-12-15 09:39:27 UTC
++++ tests/CMakeLists.txt
+@@ -119,7 +119,7 @@ add_test(
+ "${CMAKE_CURRENT_SOURCE_DIR}/find_package"
+ "${CMAKE_CURRENT_BINARY_DIR}/find_package"
+ --build-options
+- "-Dglaze_ROOT:PATH=${CMAKE_CURRENT_BINARY_DIR}/install"
++ "-Dglaze_ROOT:PATH=${FREEBSD_STAGEDIR_PREFIX}"
+ "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+ "-DBUILD_TESTING=ON"
+ --test-command "${CMAKE_CTEST_COMMAND}" --verbose --output-on-failure # inner ctest command