CVS commit: pkgsrc/parallel/threadingbuildingblocks

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Dec  7 16:07:05 UTC 2024

Modified Files:
        pkgsrc/parallel/threadingbuildingblocks: Makefile PLIST

Log Message:
threadingbuildingblocks: Fix PLIST on LP32 archs


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/parallel/threadingbuildingblocks/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/threadingbuildingblocks/PLIST

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.16 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.17
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.16       Thu Nov 14 22:21:21 2024
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile    Sat Dec  7 16:07:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/11/14 22:21:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/12/07 16:07:05 nia Exp $
 
 DISTNAME=      oneTBB-2022.0.0
 PKGNAME=       ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/}
@@ -28,6 +28,15 @@ BUILDLINK_TRANSFORM.SunOS+=  rm:-Wl,--ver
 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
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=   lp32 lp64
+.if !empty(LP32PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
+PLIST.lp32=    yes
+.else
+PLIST.lp64=    yes
+.endif
+
 .include "../../devel/cmake/build.mk"
 .include "../../parallel/hwloc/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/parallel/threadingbuildingblocks/PLIST
diff -u pkgsrc/parallel/threadingbuildingblocks/PLIST:1.5 pkgsrc/parallel/threadingbuildingblocks/PLIST:1.6
--- pkgsrc/parallel/threadingbuildingblocks/PLIST:1.5   Sat Nov  9 18:43:12 2024
+++ pkgsrc/parallel/threadingbuildingblocks/PLIST       Sat Dec  7 16:07:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2024/11/09 18:43:12 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.6 2024/12/07 16:07:05 nia Exp $
 include/oneapi/tbb.h
 include/oneapi/tbb/blocked_range.h
 include/oneapi/tbb/blocked_range2d.h
@@ -154,5 +154,6 @@ lib/libtbbmalloc.so.2.14
 lib/libtbbmalloc_proxy.so
 lib/libtbbmalloc_proxy.so.2
 lib/libtbbmalloc_proxy.so.2.14
-lib/pkgconfig/tbb.pc
+${PLIST.lp64}lib/pkgconfig/tbb.pc
+${PLIST.lp32}lib/pkgconfig/tbb32.pc
 share/doc/TBB/README.md