git: 0a7c8087e3d7 - main - devel/bloomberg-bde: improve build a little
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Aug 2023 20:57:23 UTC
The branch main has been updated by adridg:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0a7c8087e3d72b7f9b6ae216f8c40fb0bfb9702a
commit 0a7c8087e3d72b7f9b6ae216f8c40fb0bfb9702a
Author: Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2023-08-07 18:55:08 +0000
Commit: Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2023-08-15 20:52:35 +0000
devel/bloomberg-bde: improve build a little
- fix build on 12.4
- add a testing target (builds *some* of the tests only)
- remove bundled pcre2 after stage (reported by diizzy@)
- teach portscout to ignore 'testtag'
---
devel/bloomberg-bde/Makefile | 17 +++++++++++++++++
.../files/patch-groups_bsl_bsls_bsls__platform.h | 13 +++++++++++--
devel/bloomberg-bde/pkg-plist | 2 --
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/devel/bloomberg-bde/Makefile b/devel/bloomberg-bde/Makefile
index 62a4a4c5513f..1d6802e3b0e1 100644
--- a/devel/bloomberg-bde/Makefile
+++ b/devel/bloomberg-bde/Makefile
@@ -1,5 +1,6 @@
PORTNAME= bde
DISTVERSION= 3.117.0.0
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= bloomberg-
@@ -15,6 +16,8 @@ USE_GITHUB= yes
GH_ACCOUNT= bloomberg
GH_PROJECT= bde-tools:tools
+PORTSCOUT= ignore:testtag
+
_tools= ${WRKDIR}/bde-tools-${DISTVERSION}
CMAKE_ARGS= \
@@ -28,4 +31,18 @@ CMAKE_ARGS= \
-DCMAKE_INSTALL_LIBDIR=lib \
--log-level=ERROR
+post-stage:
+ ${RM} ${STAGEDIR}/${LOCALBASE}/lib/libpcre2.a
+ ${RM} ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/pcre2.pc
+
+# Tests are limited to this label. The BDE tests are grouped and hierarchical,
+# with "all.t" being the most general, and then groups like "bsla.t" to select
+# specific tests, down to "bsla_printf.t" for just a single test. We don't
+# do all of the tests since many of them don't build yet.
+_test_label= bsla.t
+
+do-test:
+ cd ${TEST_WRKSRC} && ninja `ctest -N -L ${_test_label} | awk '/Test *#/{print $$3}'`
+ cd ${TEST_WRKSRC} && ctest -L ${_test_label}
+
.include <bsd.port.mk>
diff --git a/devel/bloomberg-bde/files/patch-groups_bsl_bsls_bsls__platform.h b/devel/bloomberg-bde/files/patch-groups_bsl_bsls_bsls__platform.h
index 04257ee90348..ad387011ed71 100644
--- a/devel/bloomberg-bde/files/patch-groups_bsl_bsls_bsls__platform.h
+++ b/devel/bloomberg-bde/files/patch-groups_bsl_bsls_bsls__platform.h
@@ -1,11 +1,20 @@
---- groups/bsl/bsls/bsls_platform.h.orig 2023-07-30 12:59:02 UTC
+--- groups/bsl/bsls/bsls_platform.h.orig 2023-04-21 15:40:03 UTC
+++ groups/bsl/bsls/bsls_platform.h
-@@ -662,7 +662,7 @@ struct bsls_Platform_Assert;
+@@ -662,9 +662,16 @@ struct bsls_Platform_Assert;
// GNU libc or Linux or Cygwin
#if defined(BSLS_PLATFORM_OS_LINUX) || defined(BSLS_PLATFORM_OS_CYGWIN) \
- || defined(__GLIBC__)
+ || defined(__GLIBC__) || defined(BSLS_PLATFORM_OS_FREEBSD)
++#if defined(BSLS_PLATFORM_OS_FREEBSD)
++ #include <osreldate.h>
++#if __FreeBSD_version < 1300000
++ #include <sys/endian.h>
++#else
#include <endian.h>
++#endif
++#endif
#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ #define BSLS_PLATFORM_IS_LITTLE_ENDIAN 1
+ #elif (__BYTE_ORDER == __BIG_ENDIAN)
diff --git a/devel/bloomberg-bde/pkg-plist b/devel/bloomberg-bde/pkg-plist
index d4e55abed2b0..17496074947e 100644
--- a/devel/bloomberg-bde/pkg-plist
+++ b/devel/bloomberg-bde/pkg-plist
@@ -1258,7 +1258,6 @@ lib/libbbl.a
lib/libbdl.a
lib/libbsl.a
lib/libinteldfp.a
-lib/libpcre2.a
lib/libryu.a
lib/libs_baltst.a
libdata/pkgconfig/bal.pc
@@ -1266,6 +1265,5 @@ libdata/pkgconfig/bbl.pc
libdata/pkgconfig/bdl.pc
libdata/pkgconfig/bsl.pc
libdata/pkgconfig/inteldfp.pc
-libdata/pkgconfig/pcre2.pc
libdata/pkgconfig/ryu.pc
libdata/pkgconfig/s-baltst.pc