diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-09-24 15:25:39 +0200 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-09-24 15:25:39 +0200 |
| commit | 6e890bf6ce299ef37def942cb7a05a24e7a70642 (patch) | |
| tree | 45be7048e3951e8765b9e606174686d2b554b91e /onetbb | |
| parent | aff0581d7d04f53213295408e2aa89166c9ecb17 (diff) | |
| parent | 57a98f94ef7948d15707e8fd8a0f86099890f30b (diff) | |
| download | contrib-6e890bf6ce299ef37def942cb7a05a24e7a70642.tar.gz contrib-6e890bf6ce299ef37def942cb7a05a24e7a70642.tar.xz | |
Merge remote-tracking branch 'origin/3.6' into 3.7
Diffstat (limited to 'onetbb')
| -rw-r--r-- | onetbb/.footprint | 17 | ||||
| -rw-r--r-- | onetbb/.signature | 9 | ||||
| -rw-r--r-- | onetbb/824.patch | 0 | ||||
| -rw-r--r-- | onetbb/Pkgfile | 9 |
4 files changed, 16 insertions, 19 deletions
diff --git a/onetbb/.footprint b/onetbb/.footprint index c82fcc4d2..a48e70ea6 100644 --- a/onetbb/.footprint +++ b/onetbb/.footprint @@ -24,6 +24,7 @@ drwxr-xr-x root/root usr/include/oneapi/tbb/detail/ -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_aligned_space.h -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_allocator_traits.h -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_assert.h +-rw-r--r-- root/root usr/include/oneapi/tbb/detail/_attach.h -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_concurrent_queue_base.h -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_concurrent_skip_list.h -rw-r--r-- root/root usr/include/oneapi/tbb/detail/_concurrent_unordered_base.h @@ -153,17 +154,17 @@ drwxr-xr-x root/root usr/lib/cmake/TBB/ lrwxrwxrwx root/root usr/lib/libirml.so -> libirml.so.1 -rwxr-xr-x root/root usr/lib/libirml.so.1 lrwxrwxrwx root/root usr/lib/libtbb.so -> libtbb.so.12 -lrwxrwxrwx root/root usr/lib/libtbb.so.12 -> libtbb.so.12.5 --rwxr-xr-x root/root usr/lib/libtbb.so.12.5 +lrwxrwxrwx root/root usr/lib/libtbb.so.12 -> libtbb.so.12.6 +-rwxr-xr-x root/root usr/lib/libtbb.so.12.6 lrwxrwxrwx root/root usr/lib/libtbbbind_2_5.so -> libtbbbind_2_5.so.3 -lrwxrwxrwx root/root usr/lib/libtbbbind_2_5.so.3 -> libtbbbind_2_5.so.3.5 --rwxr-xr-x root/root usr/lib/libtbbbind_2_5.so.3.5 +lrwxrwxrwx root/root usr/lib/libtbbbind_2_5.so.3 -> libtbbbind_2_5.so.3.6 +-rwxr-xr-x root/root usr/lib/libtbbbind_2_5.so.3.6 lrwxrwxrwx root/root usr/lib/libtbbmalloc.so -> libtbbmalloc.so.2 -lrwxrwxrwx root/root usr/lib/libtbbmalloc.so.2 -> libtbbmalloc.so.2.5 --rwxr-xr-x root/root usr/lib/libtbbmalloc.so.2.5 +lrwxrwxrwx root/root usr/lib/libtbbmalloc.so.2 -> libtbbmalloc.so.2.6 +-rwxr-xr-x root/root usr/lib/libtbbmalloc.so.2.6 lrwxrwxrwx root/root usr/lib/libtbbmalloc_proxy.so -> libtbbmalloc_proxy.so.2 -lrwxrwxrwx root/root usr/lib/libtbbmalloc_proxy.so.2 -> libtbbmalloc_proxy.so.2.5 --rwxr-xr-x root/root usr/lib/libtbbmalloc_proxy.so.2.5 +lrwxrwxrwx root/root usr/lib/libtbbmalloc_proxy.so.2 -> libtbbmalloc_proxy.so.2.6 +-rwxr-xr-x root/root usr/lib/libtbbmalloc_proxy.so.2.6 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/tbb.pc drwxr-xr-x root/root usr/lib/python3.10/ diff --git a/onetbb/.signature b/onetbb/.signature index afd474e02..255dc46f9 100644 --- a/onetbb/.signature +++ b/onetbb/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30i9/Ae9TbiZGZ4YSY4U3Eq83BQFQZOWhUINfudHwXVYyZuYtsJqS6ayyA8zobYK1x0Mm0dDN7lH5nu+PFdxegw= -SHA256 (Pkgfile) = cac50456f0a5239df38c8881616c04f534c95906b59015964dbec3915202936c -SHA256 (.footprint) = 0d4dd22e4ae3cbc7a5fe0f88f831f275ccd344b5eda84db0021ea9cf1955d654 -SHA256 (onetbb-2021.5.0.tar.gz) = e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a -SHA256 (824.patch) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +RWSagIOpLGJF3wz5quIYgyZWd0UvUE/mAxA9n5YFQfou2AhoMmBDlB4RCekknDuYPK8z54zMqmTYDVY6UIH3M6vJt7gkL5XBYgQ= +SHA256 (Pkgfile) = fe868ad1ec4173953a6ec62e583d98f0665bffc576736f6c4528efdbf4ce2919 +SHA256 (.footprint) = a3ba4942c2e61218153fff3bdb0b79fc583eb8203c7d3116dc6052abbbc9737e +SHA256 (onetbb-2021.6.0.tar.gz) = 4897dd106d573e9dacda8509ca5af1a0e008755bf9c383ef6777ac490223031f diff --git a/onetbb/824.patch b/onetbb/824.patch deleted file mode 100644 index e69de29bb..000000000 --- a/onetbb/824.patch +++ /dev/null diff --git a/onetbb/Pkgfile b/onetbb/Pkgfile index b7dc60ca3..a02c8e106 100644 --- a/onetbb/Pkgfile +++ b/onetbb/Pkgfile @@ -4,14 +4,11 @@ # Depends on: cmake hwloc ninja swig name=onetbb -version=2021.5.0 -release=3 -source=(https://github.com/oneapi-src/oneTBB/archive/v$version/$name-$version.tar.gz - 824.patch) +version=2021.6.0 +release=1 +source=(https://github.com/oneapi-src/oneTBB/archive/v$version/$name-$version.tar.gz) build() { - patch -Np1 -d oneTBB-$version -i $SRC/824.patch - cmake -S oneTBB-$version -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ |