pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/parallel/threadingbuildingblocks



Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May 22 21:09:10 UTC 2025

Modified Files:
        pkgsrc/parallel/threadingbuildingblocks: Makefile
Added Files:
        pkgsrc/parallel/threadingbuildingblocks: options.mk

Log Message:
threadingbuildingblocks: Make tests build optional

This helps with building on sparc64, and probably elsewhere too.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/parallel/threadingbuildingblocks/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/parallel/threadingbuildingblocks/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/threadingbuildingblocks/Makefile
diff -u pkgsrc/parallel/threadingbuildingblocks/Makefile:1.19 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.20
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.19       Thu Apr 17 21:52:07 2025
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile    Thu May 22 21:09:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/04/17 21:52:07 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2025/05/22 21:09:09 nia Exp $
 
 DISTNAME=      oneTBB-2022.0.0
 PKGNAME=       ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/}
@@ -20,10 +20,6 @@ USE_CXX_FEATURES=    c++11
 CMAKE_CONFIGURE_ARGS+= -DTBB_OUTPUT_DIR_BASE=pkgsrc
 CMAKE_CONFIGURE_ARGS+= -DTBB_STRICT=OFF
 
-TEST_TARGET=   test
-# For Darwin
-TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/pkgsrc_relwithdebinfo
-
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbb/def/lin64-tbb.def
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbbmalloc/def/lin64-tbbmalloc.def
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbbmalloc_proxy/def/lin64-proxy.def
@@ -37,6 +33,7 @@ PLIST.lp32=   yes
 PLIST.lp64=    yes
 .endif
 
+.include "options.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../parallel/hwloc/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Added files:

Index: pkgsrc/parallel/threadingbuildingblocks/options.mk
diff -u /dev/null pkgsrc/parallel/threadingbuildingblocks/options.mk:1.1
--- /dev/null   Thu May 22 21:09:10 2025
+++ pkgsrc/parallel/threadingbuildingblocks/options.mk  Thu May 22 21:09:09 2025
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2025/05/22 21:09:09 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.threadingbuildingblocks
+PKG_SUPPORTED_OPTIONS=         tests
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtests)
+TEST_TARGET=           test
+# For Darwin
+TEST_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/pkgsrc_relwithdebinfo
+.else
+CMAKE_CONFIGURE_ARGS+= -DTBB_TEST=OFF
+.endif



Home | Main Index | Thread Index | Old Index