From 3c8a52c463e533b189937f230d4d7ced265a8e79 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 24 Dec 2019 08:52:16 +0300 Subject: [PATCH] intel-tbb: Update to 2020.0 --- mingw-w64-intel-tbb/PKGBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mingw-w64-intel-tbb/PKGBUILD b/mingw-w64-intel-tbb/PKGBUILD index 989395883b..102829ebcc 100644 --- a/mingw-w64-intel-tbb/PKGBUILD +++ b/mingw-w64-intel-tbb/PKGBUILD @@ -3,8 +3,7 @@ _realname=intel-tbb pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2019_20190605 -_pkgver=2019_U8 +pkgver=2020.0 pkgrel=1 epoch=1 pkgdesc='High level abstract threading library (mingw-w64)' @@ -14,13 +13,13 @@ options=('!strip' 'staticlibs') arch=('any') url='https://www.threadingbuildingblocks.org/' license=('Apache') -source=(https://github.com/01org/tbb/archive/${_pkgver}.tar.gz +source=(${_realname}-${pkgver}.tar.gz::https://github.com/intel/tbb/archive/v${pkgver}.tar.gz 'tbb-disable_windows_api.patch') -sha256sums=('7b1fd8caea14be72ae4175896510bf99c809cd7031306a1917565e6de7382fba' +sha256sums=('8eed2377ac62e6ac10af5a8303ce861e4525ffe491a061b48e8fe094fc741ce9' '413e75118518074da634258ccdb57ff134f4ec234ca1ae17dd5a2decf8c677f6') prepare () { - cd ${srcdir}/tbb-${_pkgver} + cd ${srcdir}/tbb-${pkgver} # do not build debug libraries #sed -i "/debug/d" Makefile @@ -47,7 +46,7 @@ prepare () { } build() { - cd ${srcdir}/tbb-${_pkgver} + cd ${srcdir}/tbb-${pkgver} sed -i "s|OUTPUT_KEY = -o #|OUTPUT_KEY = -Wl,--out-implib,lib\$(BUILDING_LIBRARY).a -o #|g" build/windows.gcc.inc #sed -i "s|\$(call detect_js,/minversion gcc 4.4)|ok|g" build/windows.gcc.inc @@ -68,7 +67,7 @@ build() { } package() { - cd ${srcdir}/tbb-${_pkgver} + cd ${srcdir}/tbb-${pkgver} if test "${MINGW_CHOST}" = "x86_64-w64-mingw32" then @@ -80,9 +79,9 @@ package() { install -d "${pkgdir}${MINGW_PREFIX}"/include cp -a include/tbb "${pkgdir}${MINGW_PREFIX}"/include install -d "${pkgdir}${MINGW_PREFIX}"/bin - install -m755 build/windows_${parch}_gcc_mingw_debug/*.dll "${pkgdir}${MINGW_PREFIX}"/bin + #install -m755 build/windows_${parch}_gcc_mingw_debug/*.dll "${pkgdir}${MINGW_PREFIX}"/bin install -m755 build/windows_${parch}_gcc_mingw_release/*.dll "${pkgdir}${MINGW_PREFIX}"/bin install -d "${pkgdir}${MINGW_PREFIX}"/lib - install -m755 build/windows_${parch}_gcc_mingw_debug/*.a "${pkgdir}${MINGW_PREFIX}"/lib + #install -m755 build/windows_${parch}_gcc_mingw_debug/*.a "${pkgdir}${MINGW_PREFIX}"/lib install -m755 build/windows_${parch}_gcc_mingw_release/*.a "${pkgdir}${MINGW_PREFIX}"/lib }