From nobody Tue Aug 15 20:57:23 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQNr44LSBz4qQ8G; Tue, 15 Aug 2023 20:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQNr425Hzz3c1W; Tue, 15 Aug 2023 20:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692133044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMTjCX8oL1XLTqSbwvHXzKnqFl9y454nTN+5+T8KS14=; b=cMPEZRhZkYpnYM4CP+P1n9pu9eBW3L3l75mvGU3e3dgR2ih55mQbFSf6BQ/iZ10KjOd7jo OCqObuwOAVFy0mmjHTvA+hyJ5YQZ7CRrp8VWC+Zk/f+aAFK02u8zl2kLloHTvEF0jS2Mb5 ZqxjGCbR1i5MAGGuYG3e5jBbY3PwePOVTolQyyS+0IKIvx4fzfCgFk+/hOfyFlteox8qbh TmoNAWNYvSfDFYRBzubBcGRq6V2UcL+pcEZ36pmyrN3JvYlC1I4scWovbTWzH86iTDyO3D lT9ERyFH+NpadR2U9L+lWT3ZLBPqKaRdtYi6BMnmXTq3JVBlLOO7i5FTCLFCtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692133044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMTjCX8oL1XLTqSbwvHXzKnqFl9y454nTN+5+T8KS14=; b=QszKRXgocMiKB9dk2oLadxstpqTnF0zF3Zs7VwYyx99uVETJ/aXOse39Xi5xUt+BHyq1mp 4eIjuWi18OrfRQwZ57ZY0JlSOfRE99Ry+rqDo6tN3/DQtwUCufPCM2D+LzDwLYi4RH5bUI ubTmzr755ETrw6HzOATliLRzN1VB1bME8jWC+t/zZkcBYJfrNehIBvzxXPD8+S/PzzrnWB iflXnbSvXKwKSDfBYjRt73ug9MTtwHOtS1aqjm2TwVEcjPGBnLqrh3OFHpCzndC719DsjW ieFAEyvrQFnJNK5hoa4ZV1+EMqP34693AkxpLp16fX4whffMNW9q3TNS0TslBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692133044; a=rsa-sha256; cv=none; b=gOTF31OBqXOG37pJGBmwTtEo+99HEYJsz1YFTEKKfzpdXsVKdnzOoHOcvQbQwiFimQYmbG 0/AcZWudsFT7Kv1LHnPdS7VeelK86Y16NNDvm71rm7VWLmXbiVwQYC4PH/RwSErbipE8pW lR+D0zRNQYLMQ/rfbYq+mzgg8YJNqXyucYFe4NZDfhFgjRzN2Q/5wF2l6+Dt1zaxUeMOdK DL9v5s7xDKu/JVM9tD9zGwY/llLPCo1m5L1rBhWUEl0YyaDVv4C+smXkGfqtf3e10pPehZ Cnqq19thfMadc6nWUhhOSZynFVLMjMwC63YB0fIJItsxL1WW4R3fFnt8jlAnmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQNr405MTz9JP; Tue, 15 Aug 2023 20:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FKvN7Q058299; Tue, 15 Aug 2023 20:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FKvN42058296; Tue, 15 Aug 2023 20:57:23 GMT (envelope-from git) Date: Tue, 15 Aug 2023 20:57:23 GMT Message-Id: <202308152057.37FKvN42058296@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 0a7c8087e3d7 - main - devel/bloomberg-bde: improve build a little List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a7c8087e3d72b7f9b6ae216f8c40fb0bfb9702a Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a7c8087e3d72b7f9b6ae216f8c40fb0bfb9702a commit 0a7c8087e3d72b7f9b6ae216f8c40fb0bfb9702a Author: Adriaan de Groot AuthorDate: 2023-08-07 18:55:08 +0000 Commit: Adriaan de Groot 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 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 ++#if __FreeBSD_version < 1300000 ++ #include ++#else #include ++#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