diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-cpp/tbb | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-cpp/tbb')
-rw-r--r-- | dev-cpp/tbb/Manifest | 7 | ||||
-rw-r--r-- | dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch | 62 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-2019.8.ebuild | 4 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-2020.1.ebuild | 151 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-2020.2.ebuild | 151 |
5 files changed, 372 insertions, 3 deletions
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index fb3971d774a4..24810166db3c 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,9 +1,14 @@ AUX tbb-2017.20161128-build.patch 4840 BLAKE2B eec4a437f0a609c8f39b76950aae76c9e357cd0705ad521a3304aceb8361c10cdf0d28078370c840ad315cbe06f3b134ca5d58036b2718a136f3958c3942e9c1 SHA512 40ca5bdfe05eecbc47a9af062e6ede3e14200048cdebd796af71cd5f27b350c65e5aa569cc8a6e2f3cfbd90fec167d4f053abc36310b07113910ba25061c56a4 +AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4 AUX tbb-4.4.20160803-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1 DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8 +DIST tbb-2020.1.tar.gz 2639115 BLAKE2B 058438351738eeab01c230ec10ff0a1dde77e5cc4fd77f292c31ee0320f41d079c8f90fc06f4640ffa375d5f0c0b5fbed13ac5a64a9cb9f1737cb66bc80442ea SHA512 79810c27c84bd3b3432bef471fa1c782f1f162a0d1038e88c03a77499cc7aeaa10d57317729fd23472e2d0f358395955f7570e8c679685a552a833eb45cf5f1d +DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c EBUILD tbb-2017.20161128.ebuild 3321 BLAKE2B 26df534fbac469b7259d3f345ec7913732ce0d1aa8a6fa8cf8e98d4269cc5a8196b5daa7daeddb84e59aefa83775f130389a7f3e16de3da54bb964f34c817e1c SHA512 56beab0190012f060a9dd0ea3fd87d4461dd0839b3b052e54e7e864adbef972f96b7178c915da8bfc7efcedc8db3f409ec134fa47d66636cf6fae96cda337e3f EBUILD tbb-2018.20180312.ebuild 3322 BLAKE2B ff7304a9a6b702eac73f41ec9e61c8332ed24473e264cfa52a38c1954b61829140be4855f9fbab9f9715f393e6eae185e0b53e3051bdf4f9e858bc2682712328 SHA512 d5006b479abdea75d3d6e22311629eb70d9b78c19c8cf687a1ce16f91303d46d8cc04e779f24f3bab67e556756a8c1f3e4f4143cd6dad36613902109596f522d -EBUILD tbb-2019.8.ebuild 3225 BLAKE2B 830ed96fa96032847b7543ceaa5f23d8e5dc767519f7dcd1a294582a967a801dfaad3251b3f1c91cb5a2b0ad9b8ea57c3adb5685131608257ca515f053fba2db SHA512 da5b02cee27b4b67a1857061202abacd20eeed8887b540f71f75ffd161feeeb8901803439d6af667584df0a9bf5e9090d7768f314ad77779a06cda04a255b60b +EBUILD tbb-2019.8.ebuild 3221 BLAKE2B 25be613f89f8bd8fcb5a355cd5f11e3e4fc32712d3718232cab19edaeb30d0c17b1cff4f8773e296f16669667c72bab1132ac81e6b33062f919323a501037c82 SHA512 b3ccb6c2341d85f8e277f561917285838c41c592002d213b4e24ef1abe8aeea3605a39d22566d3a90df81bbdd9ae225443c9d9d7ffd1157280f7563949827771 +EBUILD tbb-2020.1.ebuild 3389 BLAKE2B 4dfa1858e8846345aff78cc88e64e068b097b926c29dd2fd796a25665bbbe7f3ce2886609f62abf168bb244b3b3fcbd2317423a16caf96cf5b34ed54f0861125 SHA512 0d799a1013d10c725b98f41244913bb61ce66bb8297b8a9e5076d087cc667db204fb9f2dea042c4c781f7fd84d42357e5c572ce8dab4a176e80e06c65e58b770 +EBUILD tbb-2020.2.ebuild 3397 BLAKE2B b5824f331e87bdfa563c1bb430d8d599ad5d3415c3582d6c3d7deb036b0aef8009798d986af9e8f01f49c1fc77559f0de31a47f75044d13b20a9ca4a35f997c6 SHA512 c659086dd1beedbc05bb1570185d546970040714c2c4bbb3db595a20b04070397538ae79777e3ae01ce18fc5033709ed4e6a8ad535f5c9967e71db05893b846d MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13 diff --git a/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch b/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch new file mode 100644 index 000000000000..b4313b375f59 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch @@ -0,0 +1,62 @@ +--- a/Makefile 2020-01-21 12:26:46.000000000 +0100 ++++ b/Makefile 2020-03-18 16:21:37.589262099 +0100 +@@ -26,29 +26,29 @@ + all: tbb tbbmalloc tbbproxy test examples + + tbb: mkdir +- $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbb cfg=release ++ $(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.tbb cfg=$(cfg) + + tbbmalloc: mkdir +- $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc ++ $(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=$(cfg) malloc + + tbbproxy: mkdir +- $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy ++ $(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=$(cfg) tbbproxy + + tbbbind: mkdir +- $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbbind cfg=release tbbbind ++ $(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.tbbbind cfg=$(cfg) tbbbind + + test: tbb tbbmalloc $(if $(use_proxy),tbbproxy) +- -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test +- -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.test cfg=release ++ -$(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=$(cfg) malloc_test ++ -$(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.test cfg=$(cfg) + + rml: mkdir +- $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.rml cfg=release ++ $(MAKE) -C "$(work_dir)_$(cfg)" -r -f $(tbb_root)/build/Makefile.rml cfg=$(cfg) + + examples: tbb tbbmalloc +- $(MAKE) -C examples -r -f Makefile tbb_root=.. release test ++ $(MAKE) -C examples -r -f Makefile tbb_root=.. $(cfg) test + + python: tbb +- $(MAKE) -C "$(work_dir)_release" -rf $(tbb_root)/python/Makefile install ++ $(MAKE) -C "$(work_dir)_$(cfg)" -rf $(tbb_root)/python/Makefile install + + doxygen: + doxygen Doxyfile +@@ -56,16 +56,16 @@ + .PHONY: clean clean_examples mkdir info + + clean: clean_examples +- $(shell $(RM) $(work_dir)_release$(SLASH)*.* >$(NUL) 2>$(NUL)) +- $(shell $(RD) $(work_dir)_release >$(NUL) 2>$(NUL)) ++ $(shell $(RM) $(work_dir)_$(cfg)$(SLASH)*.* >$(NUL) 2>$(NUL)) ++ $(shell $(RD) $(work_dir)_$(cfg) >$(NUL) 2>$(NUL)) + @echo clean done + + clean_examples: + $(shell $(MAKE) -s -i -r -C examples -f Makefile tbb_root=.. clean >$(NUL) 2>$(NUL)) + + mkdir: +- $(shell $(MD) "$(work_dir)_release" >$(NUL) 2>$(NUL)) +- @echo Created the $(work_dir)_release directory ++ $(shell $(MD) "$(work_dir)_$(cfg)" >$(NUL) 2>$(NUL)) ++ @echo Created the $(work_dir)_$(cfg) directory + + info: + @echo OS: $(tbb_os) diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild index d123fda91ce8..95a53b4474b3 100644 --- a/dev-cpp/tbb/tbb-2019.8.ebuild +++ b/dev-cpp/tbb/tbb-2019.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ HOMEPAGE="https://www.threadingbuildingblocks.org" SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="debug examples" DEPEND="" diff --git a/dev-cpp/tbb/tbb-2020.1.ebuild b/dev-cpp/tbb/tbb-2020.1.ebuild new file mode 100644 index 000000000000..4ed58041f012 --- /dev/null +++ b/dev-cpp/tbb/tbb-2020.1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs + +PV1="$(ver_cut 1)" +PV2="$(ver_cut 2)" +MY_PV="${PV1}_U${PV2}" + +DESCRIPTION="High level abstract threading library" +HOMEPAGE="https://www.threadingbuildingblocks.org" +SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug examples" + +DEPEND="" +RDEPEND="${DEPEND}" +S="${WORKDIR}/oneTBB-${MY_PV}" + +DOCS=( CHANGES README README.md doc/Release_Notes.txt ) + +PATCHES=( "${FILESDIR}"/${P}-makefile-debug.patch ) + +src_prepare() { + default + + find include -name \*.html -delete || die + + # Give it a soname on FreeBSD + echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc + # Set proper versionning on FreeBSD + sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die + + use debug || sed -i -e '/_debug/d' Makefile +} + +multilib_src_configure() { + # pc files are for debian and fedora compatibility + # some deps use them + cat <<-EOF > ${PN}.pc.template + prefix=${EPREFIX}/usr + libdir=\${prefix}/$(get_libdir) + includedir=\${prefix}/include + Name: ${PN} + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Cflags: -I\${includedir} + EOF + cp ${PN}.pc.template ${PN}.pc || die + cat <<-EOF >> ${PN}.pc + Libs: -L\${libdir} -ltbb + Libs.private: -lm -lrt + EOF + cp ${PN}.pc.template ${PN}malloc.pc || die + cat <<-EOF >> ${PN}malloc.pc + Libs: -L\${libdir} -ltbbmalloc + Libs.private: -lm -lrt + EOF + cp ${PN}.pc.template ${PN}malloc_proxy.pc || die + cat <<-EOF >> ${PN}malloc_proxy.pc + Libs: -L\${libdir} -ltbbmalloc_proxy + Libs.private: -lrt + Requires: tbbmalloc + EOF +} + +local_src_compile() { + cd "${S}" + + local comp arch + local bt buildtypes + + case ${MULTILIB_ABI_FLAG} in + abi_x86_64) arch=x86_64 ;; + abi_x86_32) arch=ia32 ;; +# abi_ppc_64) arch=ppc64 ;; +# abi_ppc_32) arch=ppc32 ;; + esac + + case "$(tc-getCXX)" in + *clang*) comp="clang" ;; + *g++*) comp="gcc" ;; + *ic*c) comp="icc" ;; + *) die "compiler $(tc-getCXX) not supported by build system" ;; + esac + + if use debug ; then + buildtypes="release debug" + else + buildtypes="release" + fi + + for bt in ${buildtypes}; do + CXX="$(tc-getCXX)" \ + CC="$(tc-getCC)" \ + AS="$(tc-getAS)" \ + arch=${arch} \ + CPLUS_FLAGS="${CXXFLAGS}" \ + emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@ + done +} + +multilib_src_compile() { + local_src_compile tbb tbbmalloc +} + +multilib_src_test() { + local_src_compile test +} + +multilib_src_install() { + local bt + local buildtypes + if use debug ; then + buildtypes="release debug" + else + buildtypes="release" + fi + for bt in ${buildtypes}; do + cd "${BUILD_DIR}_${bt}" || die + local l + for l in $(find . -name lib\*$(get_libname \*)); do + dolib.so ${l} + local bl=$(basename ${l}) + dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname) + done + done + + cd "${BUILD_DIR}" || die + insinto /usr/$(get_libdir)/pkgconfig + doins *.pc +} + +multilib_src_install_all() { + doheader -r include/* + + einstalldocs + + if use examples ; then + insinto /usr/share/doc/${PF}/examples/build + doins build/*.inc + insinto /usr/share/doc/${PF}/examples + doins -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi +} diff --git a/dev-cpp/tbb/tbb-2020.2.ebuild b/dev-cpp/tbb/tbb-2020.2.ebuild new file mode 100644 index 000000000000..25976f821bad --- /dev/null +++ b/dev-cpp/tbb/tbb-2020.2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs + +PV1="$(ver_cut 1)" +PV2="$(ver_cut 2)" +MY_PV="${PV1}_U${PV2}" + +DESCRIPTION="High level abstract threading library" +HOMEPAGE="https://www.threadingbuildingblocks.org" +SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug examples" + +DEPEND="" +RDEPEND="${DEPEND}" +S="${WORKDIR}/oneTBB-${MY_PV}" + +DOCS=( CHANGES README README.md doc/Release_Notes.txt ) + +PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch ) + +src_prepare() { + default + + find include -name \*.html -delete || die + + # Give it a soname on FreeBSD + echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc + # Set proper versionning on FreeBSD + sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die + + use debug || sed -i -e '/_debug/d' Makefile +} + +multilib_src_configure() { + # pc files are for debian and fedora compatibility + # some deps use them + cat <<-EOF > ${PN}.pc.template + prefix=${EPREFIX}/usr + libdir=\${prefix}/$(get_libdir) + includedir=\${prefix}/include + Name: ${PN} + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Cflags: -I\${includedir} + EOF + cp ${PN}.pc.template ${PN}.pc || die + cat <<-EOF >> ${PN}.pc + Libs: -L\${libdir} -ltbb + Libs.private: -lm -lrt + EOF + cp ${PN}.pc.template ${PN}malloc.pc || die + cat <<-EOF >> ${PN}malloc.pc + Libs: -L\${libdir} -ltbbmalloc + Libs.private: -lm -lrt + EOF + cp ${PN}.pc.template ${PN}malloc_proxy.pc || die + cat <<-EOF >> ${PN}malloc_proxy.pc + Libs: -L\${libdir} -ltbbmalloc_proxy + Libs.private: -lrt + Requires: tbbmalloc + EOF +} + +local_src_compile() { + cd "${S}" + + local comp arch + local bt buildtypes + + case ${MULTILIB_ABI_FLAG} in + abi_x86_64) arch=x86_64 ;; + abi_x86_32) arch=ia32 ;; +# abi_ppc_64) arch=ppc64 ;; +# abi_ppc_32) arch=ppc32 ;; + esac + + case "$(tc-getCXX)" in + *clang*) comp="clang" ;; + *g++*) comp="gcc" ;; + *ic*c) comp="icc" ;; + *) die "compiler $(tc-getCXX) not supported by build system" ;; + esac + + if use debug ; then + buildtypes="release debug" + else + buildtypes="release" + fi + + for bt in ${buildtypes}; do + CXX="$(tc-getCXX)" \ + CC="$(tc-getCC)" \ + AS="$(tc-getAS)" \ + arch=${arch} \ + CPLUS_FLAGS="${CXXFLAGS}" \ + emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@ + done +} + +multilib_src_compile() { + local_src_compile tbb tbbmalloc +} + +multilib_src_test() { + local_src_compile test +} + +multilib_src_install() { + local bt + local buildtypes + if use debug ; then + buildtypes="release debug" + else + buildtypes="release" + fi + for bt in ${buildtypes}; do + cd "${BUILD_DIR}_${bt}" || die + local l + for l in $(find . -name lib\*$(get_libname \*)); do + dolib.so ${l} + local bl=$(basename ${l}) + dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname) + done + done + + cd "${BUILD_DIR}" || die + insinto /usr/$(get_libdir)/pkgconfig + doins *.pc +} + +multilib_src_install_all() { + doheader -r include/* + + einstalldocs + + if use examples ; then + insinto /usr/share/doc/${PF}/examples/build + doins build/*.inc + insinto /usr/share/doc/${PF}/examples + doins -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi +} |