* Re: [PR PATCH] [Updated] [WIP] tbb: update to 2020.U3.
2021-01-07 19:49 [PR PATCH] tbb: update to 2020.U3 olafmersmann
@ 2021-01-07 20:49 ` olafmersmann
2021-01-19 23:34 ` ericonr
2021-01-21 22:23 ` [PR PATCH] [Closed]: " olafmersmann
2 siblings, 0 replies; 4+ messages in thread
From: olafmersmann @ 2021-01-07 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages tbb
https://github.com/void-linux/void-packages/pull/27746
[WIP] tbb: update to 2020.U3.
A patch file from https://github.com/void-linux/void-packages/pull/27746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-27746.patch --]
[-- Type: text/x-diff, Size: 11734 bytes --]
From 2685d3007dc2cf92b516c68b1f0a48e5a66c626f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 20:42:36 +0100
Subject: [PATCH 01/12] tbb: update to 2020.U3.
---
srcpkgs/tbb/patches/hostname-usage.patch | 11 -----
srcpkgs/tbb/patches/musl.patch | 4 +-
srcpkgs/tbb/template | 60 ++++--------------------
srcpkgs/tbb/update | 3 +-
4 files changed, 13 insertions(+), 65 deletions(-)
delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index c056bc5b452..00000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/version_info_linux.sh.ORIG
-+++ build/version_info_linux.sh
-@@ -20,7 +20,7 @@
-
- # Script used to generate version info string
- echo "#define __TBB_VERSION_STRINGS(N) \\"
--echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
-+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \'
- # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
- echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch
index 0a3aa7d4f34..905d1068545 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/tbbmalloc/proxy.cpp.orig 2018-10-17 14:05:31.311723013 +0200
-+++ src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200
+--- src/tbbmalloc_proxy/proxy.cpp.orig 14:05:31.311723013 +0200
++++ src/tbbmalloc_proxy/proxy.cpp 14:06:32.972726194 +0200
@@ -28,6 +28,7 @@
// of aligned_alloc as required by new C++ standard, this makes it hard to
// redefine aligned_alloc here. However, running on systems with new libc
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 65886aae299..c456cf79f68 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,48 +1,20 @@
# Template file for 'tbb'
pkgname=tbb
-version=2020.U1
-revision=2
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+version=2021.1.1
+revision=1
+wrksrc="oneTBB-${version}"
+build_style=cmake
+configure_args="-DTBB_STRICT=NO"
+makedepends="libhwloc-devel"
+checkdepends="libgomp-devel"
short_desc="Intel Threading Building Blocks"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://www.threadingbuildingblocks.org"
-distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=d80ca22c224ab7ef913dfae72c23fc1434b6aa46bfd472916d8c874c90881f5e
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*)
- make_build_args="arch=intel64"
- ;;
- i686*)
- make_build_args="arch=ia32"
- ;;
- armv7l*)
- make_build_args="arch=armv7"
- ;;
- aarch64*)
- make_build_args="arch=arm64"
- ;;
- ppc64*)
- make_build_args="arch=ppc64"
- ;;
- ppc*)
- make_build_args="arch=ppc32"
- ;;
- *)
- # make sure to fall back instead of letting host uname control it
- make_build_args="arch=generic"
- ;;
-esac
+distfiles="https://github.com/oneapi-src/oneTBB/archive/v${version}.tar.gz"
+checksum=b182c73caaaabc44ddc5ad13113aca7e453af73c1690e4061f71dfe4935d74e8
post_extract() {
- sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc
- sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc
-
# alternative might be:
# https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -51,20 +23,6 @@ post_extract() {
fi
}
-do_install() {
- vmkdir usr/lib
- vcopy build/linux_*/*.so* usr/lib
- vmkdir usr/include/tbb
- vcopy include/tbb/* usr/include/tbb
-
- cmake \
- -DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \
- -DSYSTEM_NAME=Linux \
- -DLIB_REL_PATH=../.. \
- -DINC_REL_PATH=../../../include \
- -P cmake/tbb_config_installer.cmake
-}
-
tbb-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
diff --git a/srcpkgs/tbb/update b/srcpkgs/tbb/update
index 8c8c0ba230b..66f75411a4b 100644
--- a/srcpkgs/tbb/update
+++ b/srcpkgs/tbb/update
@@ -1 +1,2 @@
-pattern="archive/\K[0-9_U]+(?=\.tar\.gz)"
+site='https://github.com/karelzak/util-linux/releases'
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz")'
From c8e2249794dd99761c0459b5ce9fb8b9551e9451 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:05 +0100
Subject: [PATCH 02/12] blender: revbump for tbb
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index b724ef01318..01b3677ff4f 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.90.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 21c34fad67e05571b533a20072a2f0c2c83dec00 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:05 +0100
Subject: [PATCH 03/12] embree: revbump for tbb
---
srcpkgs/embree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 0bc72f46b6d..8eb54c3ed55 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,7 +1,7 @@
# Template file for 'embree'
pkgname=embree
version=2.17.7
-revision=2
+revision=3
archs="x86_64"
build_style=cmake
hostmakedepends="ispc"
From 917a011f6b344462172c65d19afc060b929506aa Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:05 +0100
Subject: [PATCH 04/12] freecad: revbump for tbb
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 6fe749b53d7..432e231b074 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.18.4
-revision=10
+revision=11
wrksrc="FreeCAD-${version}"
build_style=cmake
From 39998e4bf659456d3ee24b6f659c246f81fbb476 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:05 +0100
Subject: [PATCH 05/12] occt: revbump for tbb
---
srcpkgs/occt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index f9777bfe27b..974bd2026fe 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,7 +1,7 @@
# Template file for 'occt'
pkgname=occt
version=7.4.0p1
-revision=2
+revision=3
_gittag="V${version//./_}"
wrksrc=occt-${_gittag}
build_style=cmake
From db1f1ffa9fd2df1e3a4278eeeeb122ea643a793b Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:06 +0100
Subject: [PATCH 06/12] oce: revbump for tbb
---
srcpkgs/oce/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/oce/template b/srcpkgs/oce/template
index 6c27108769a..8762a6ada42 100644
--- a/srcpkgs/oce/template
+++ b/srcpkgs/oce/template
@@ -2,7 +2,7 @@
pkgname=oce
_majorver=0.18
version=${_majorver}.3
-revision=1
+revision=2
wrksrc="${pkgname}-OCE-${version}"
build_style=cmake
configure_args="-DOCE_INSTALL_PREFIX=/usr -DOCE_WITH_FREEIMAGE=ON
From 5917cc329f0724cc2f30c5c4e1aa3a2d7021b322 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:06 +0100
Subject: [PATCH 07/12] openimagedenoise: revbump for tbb
---
srcpkgs/openimagedenoise/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 3eb4a732684..3ffd6bdfc83 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
# Template file for 'openimagedenoise'
pkgname=openimagedenoise
version=1.2.4
-revision=1
+revision=2
archs="x86_64*"
wrksrc=oidn-${version}
build_style=cmake
From 45afc7571e3efa8a062e8b492b32b5c294932f31 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:06 +0100
Subject: [PATCH 08/12] OpenSubdiv: revbump for tbb
---
srcpkgs/OpenSubdiv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index b7a5e16efbc..d5510725158 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
# Template file for 'OpenSubdiv'
pkgname=OpenSubdiv
version=3.4.3
-revision=1
+revision=2
wrksrc="OpenSubdiv-${version//./_}"
build_style=cmake
configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
From 6a68f10112eff7c172e85022c64edbba2068a41d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:06 +0100
Subject: [PATCH 09/12] openvdb: revbump for tbb
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 72fde5bc637..732937b4cb3 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=7.0.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 27f7525e155eaefb32da43131fb5647c2ff699e3 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:06 +0100
Subject: [PATCH 10/12] paraview: revbump for tbb
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 20a7f558967..49ad9e48c2c 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=3
+revision=4
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 45bfe9e77732bed16afbc82d04bebb1054af004e Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:07 +0100
Subject: [PATCH 11/12] PrusaSlicer: revbump for tbb
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index aa195fe6ac8..c168a277d67 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=4
+revision=5
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From b8436a441c6fc0ddaf884010801b74178c1ef990 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 7 Jan 2021 21:49:07 +0100
Subject: [PATCH 12/12] sysdig: revbump for tbb
---
srcpkgs/sysdig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 1a6e38a3d73..a9c216a99c1 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.1
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
^ permalink raw reply [flat|nested] 4+ messages in thread