From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
Date: Sun, 16 Jan 2022 04:35:31 +0100 [thread overview]
Message-ID: <20220116033531.1QoNhp5HMYt1xNdY80Ri1MVW1VZNC9YuboI2wWUZM5g@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35077@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077
tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35077.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-35077.patch --]
[-- Type: text/x-diff, Size: 6236 bytes --]
From cf4e931d2f61349e4b6dc270c9e6c148e13fd184 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 15 Jan 2022 22:35:14 -0500
Subject: [PATCH] tbb: update to 2021.5.0
---
common/shlibs | 5 +-
srcpkgs/tbb/patches/hostname-usage.patch | 11 -----
srcpkgs/tbb/patches/musl.patch | 22 +++++----
srcpkgs/tbb/template | 63 +++++-------------------
4 files changed, 24 insertions(+), 77 deletions(-)
delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
-libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
libtbbmalloc_proxy.so.2 tbb-4.3_1
libtbbmalloc.so.2 tbb-4.3_1
-libtbb_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_1
libembree.so.2 embree-2.5.1_1
libgtkimageview.so.0 gtkimageview-1.6.4_1
libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index 4aefeff192b5..000000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/version_info_linux.sh
-+++ b/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 a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- a/src/tbbmalloc/proxy.cpp 2018-10-17 14:05:31.311723013 +0200
-+++ b/src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200
-@@ -28,6 +28,7 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
// version, it still needs it to be redefined, thus tricking system headers
+#if defined(__GLIBC__)
- #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #if defined(__GLIBC_PREREQ)
+ #if !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
// tell <cstdlib> that there is no aligned_alloc
- #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
-@@ -37,6 +38,7 @@
- #include <cstdlib>
+@@ -35,6 +36,7 @@
#undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
+#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..f029beef3869 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,35 @@
# Template file for 'tbb'
pkgname=tbb
-version=2020.U3
+version=2021.5.0
revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+makedepends="libgomp-devel libhwloc-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=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
-
-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
+changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/master/RELEASE_NOTES.md"
+distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz"
+checksum=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
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
vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
- -i src/tbbmalloc/proxy.h
+ -i src/tbbmalloc_proxy/proxy.h
+ vsed -e "s/RTLD_DEEPBIND/RTLD_GLOBAL/" -i src/tbb/dynamic_link.cpp
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"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.so"
vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/*.so
}
}
next prev parent reply other threads:[~2022-01-16 3:35 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-16 1:21 [PR PATCH] " cinerea0
2022-01-16 3:35 ` cinerea0 [this message]
2022-01-16 4:03 ` [PR PATCH] [Updated] " cinerea0
2022-01-16 5:36 ` [PR PATCH] [Closed]: " cinerea0
2022-01-16 6:22 ` [PR PATCH] [Updated] " cinerea0
2022-01-16 7:00 ` cinerea0
2022-01-16 7:45 ` cinerea0
2022-01-16 15:16 ` notthewave
2022-01-16 15:19 ` notthewave
2022-01-16 15:42 ` notthewave
2022-01-16 15:42 ` notthewave
2022-01-16 15:43 ` notthewave
2022-01-16 15:51 ` notthewave
2022-01-16 15:52 ` notthewave
2022-01-16 15:52 ` notthewave
2022-01-16 18:41 ` [PR REVIEW] " ericonr
2022-01-16 18:41 ` ericonr
2022-01-16 18:41 ` ericonr
2022-01-16 23:42 ` cinerea0
2022-01-17 1:35 ` [PR PATCH] [Updated] " cinerea0
2022-01-17 3:17 ` cinerea0
2022-01-17 4:37 ` cinerea0
2022-01-17 5:06 ` cinerea0
2022-01-17 6:49 ` cinerea0
2022-01-17 6:53 ` cinerea0
2022-01-17 16:03 ` [PR PATCH] [Updated] " cinerea0
2022-01-17 17:41 ` cinerea0
2022-01-17 19:00 ` cinerea0
2022-01-17 19:57 ` cinerea0
2022-01-19 20:53 ` cinerea0
2022-01-19 23:57 ` cinerea0
2022-01-20 15:45 ` cinerea0
2022-01-20 17:58 ` cinerea0
2022-01-20 18:27 ` cinerea0
2022-01-20 19:27 ` cinerea0
2022-01-20 21:20 ` cinerea0
2022-01-20 21:37 ` cinerea0
2022-01-20 22:20 ` cinerea0
2022-01-20 22:43 ` cinerea0
2022-01-20 23:49 ` [PR PATCH] [Updated] " cinerea0
2022-01-21 0:51 ` cinerea0
2022-01-21 1:23 ` cinerea0
2022-01-21 2:59 ` cinerea0
2022-01-21 3:55 ` cinerea0
2022-01-21 4:19 ` [PR PATCH] [Updated] " cinerea0
2022-01-21 5:49 ` cinerea0
2022-01-21 16:55 ` cinerea0
2022-01-24 17:09 ` cinerea0
2022-01-24 20:48 ` cinerea0
2022-01-24 22:03 ` cinerea0
2022-01-25 2:51 ` cinerea0
2022-01-25 4:23 ` [PR PATCH] [Updated] [ci skip] " cinerea0
2022-01-28 0:23 ` cinerea0
2022-01-28 6:27 ` [PR PATCH] [Closed]: " ericonr
2022-01-31 20:29 ` notthewave
2022-01-31 20:52 ` Duncaen
2022-01-31 23:57 ` paper42
2022-02-01 0:01 ` Duncaen
2022-02-01 0:07 ` Duncaen
2022-02-01 0:07 ` Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220116033531.1QoNhp5HMYt1xNdY80Ri1MVW1VZNC9YuboI2wWUZM5g@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).