From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1327599-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83A1B158086 for <garchives@archives.gentoo.org>; Wed, 6 Oct 2021 08:33:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CAB7E090F; Wed, 6 Oct 2021 08:33:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0110E090F for <gentoo-commits@lists.gentoo.org>; Wed, 6 Oct 2021 08:33:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 067133432D5 for <gentoo-commits@lists.gentoo.org>; Wed, 6 Oct 2021 08:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C455156 for <gentoo-commits@lists.gentoo.org>; Wed, 6 Oct 2021 08:33:25 +0000 (UTC) From: "Jakov Smolić" <jsmolic@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" <jsmolic@gentoo.org> Message-ID: <1633509102.4568616a2db47ffaad650f53ffb096be88e846a0.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/tbb/Manifest dev-cpp/tbb/tbb-2019.8.ebuild dev-cpp/tbb/tbb-2020.2.ebuild X-VCS-Directories: dev-cpp/tbb/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 4568616a2db47ffaad650f53ffb096be88e846a0 X-VCS-Branch: master Date: Wed, 6 Oct 2021 08:33:25 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 71fdcfbb-eec4-4017-864a-22bf400c35db X-Archives-Hash: e698b5ea38228fd6d5cb850d450e7118 commit: 4568616a2db47ffaad650f53ffb096be88e846a0 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Wed Oct 6 08:28:21 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Wed Oct 6 08:31:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4568616a dev-cpp/tbb: drop 2019.8, 2020.2 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-cpp/tbb/Manifest | 2 - dev-cpp/tbb/tbb-2019.8.ebuild | 141 --------------------------------------- dev-cpp/tbb/tbb-2020.2.ebuild | 151 ------------------------------------------ 3 files changed, 294 deletions(-) diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 4fb83d37f0e..d2d3f1d78cf 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,3 +1 @@ -DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8 -DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87 diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild deleted file mode 100644 index da66dd2bd83..00000000000 --- a/dev-cpp/tbb/tbb-2019.8.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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}/${PN}-${MY_PV}" - -DOCS=( CHANGES README README.md doc/Release_Notes.txt ) - -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 - - 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 - - CXX="$(tc-getCXX)" \ - CC="$(tc-getCC)" \ - AS="$(tc-getAS)" \ - arch=${arch} \ - CPLUS_FLAGS="${CXXFLAGS}" \ - emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@ -} - -multilib_src_compile() { - local_src_compile tbb tbbmalloc -} - -multilib_src_test() { - CXXFLAGS="${CXXFLAGS} -fabi-version=4" \ - local_src_compile -j1 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 deleted file mode 100644 index 3e132d1c71b..00000000000 --- a/dev-cpp/tbb/tbb-2020.2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 -}