From c58541d48dd81b74bd07f38163ee8bd0a7c0b814 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 1 Sep 2015 10:28:31 +0200 Subject: [PATCH] tbb: fix musl+cross --- srcpkgs/tbb/template | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 7fcb6680898..bebe2087fa5 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -1,11 +1,10 @@ # Template file for 'tbb' pkgname=tbb version=4.4.20150728 -revision=1 +revision=2 _lv="${version%.*}" _lv="${_lv//.}" _rv="${version##*.}" -only_for_archs="i686 x86_64" wrksrc="$pkgname${_lv}_${_rv}oss" build_style=gnu-makefile short_desc="Intel Threading Building Blocks" @@ -15,6 +14,21 @@ homepage="http://www.threadingbuildingblocks.org" distfiles="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${_lv}_${_rv}oss_src.tgz" checksum=e9534f3238e6f7b34f9d0a78cb8604da1c5a611c5a2569fdd9cc90e06339538a +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 + if [ "$CROSS_BUILD" ]; then + sed -i '/-m64/d' build/linux.gcc.inc + sed -i '/-mrtm/d' build/linux.gcc.inc + fi + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \ + -i src/tbbmalloc/proxy.h + ;; + esac +} + do_install() { vmkdir usr/lib vcopy build/linux_*/*.so* usr/lib