From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D67601382C5 for ; Tue, 23 Jun 2020 18:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 245B1E092B; Tue, 23 Jun 2020 18:31:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE2D3E092B for ; Tue, 23 Jun 2020 18:31:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E4F434F245 for ; Tue, 23 Jun 2020 18:31:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABAE82C6 for ; Tue, 23 Jun 2020 18:30:59 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1592937055.e11dbbf271e40d48abca3e4df048afd4dd3a7172.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libomp/libomp-10.0.1.9999.ebuild sys-libs/libomp/libomp-10.0.1_rc1.ebuild sys-libs/libomp/libomp-11.0.0.9999.ebuild X-VCS-Directories: sys-libs/libomp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e11dbbf271e40d48abca3e4df048afd4dd3a7172 X-VCS-Branch: master Date: Tue, 23 Jun 2020 18:30:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab7f5a1d-2c6e-4914-98e6-6c1ba36805a8 X-Archives-Hash: 35643cccd7b46bcb87450e3728a07b41 commit: e11dbbf271e40d48abca3e4df048afd4dd3a7172 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 21:08:42 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 23 18:30:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11dbbf2 sys-libs/libomp: Dedupe with new eclass code Signed-off-by: Michał Górny gentoo.org> sys-libs/libomp/libomp-10.0.1.9999.ebuild | 14 ++------------ sys-libs/libomp/libomp-10.0.1_rc1.ebuild | 14 ++------------ sys-libs/libomp/libomp-11.0.0.9999.ebuild | 14 ++------------ 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-10.0.1.9999.ebuild index 01e5f189d65..5bffd6685f6 100644 --- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild +++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 +inherit cmake-multilib linux-info llvm.org python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" HOMEPAGE="https://openmp.llvm.org" @@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl >=sys-devel/clang-6 )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -67,13 +64,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( @@ -98,7 +88,7 @@ multilib_src_configure() { use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" - -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DOPENMP_LIT_ARGS="$(get_lit_flags)" -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild index 01e5f189d65..5bffd6685f6 100644 --- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild +++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 +inherit cmake-multilib linux-info llvm.org python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" HOMEPAGE="https://openmp.llvm.org" @@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl >=sys-devel/clang-6 )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -67,13 +64,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( @@ -98,7 +88,7 @@ multilib_src_configure() { use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" - -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DOPENMP_LIT_ARGS="$(get_lit_flags)" -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild index 01e5f189d65..5bffd6685f6 100644 --- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 +inherit cmake-multilib linux-info llvm.org python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" HOMEPAGE="https://openmp.llvm.org" @@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl >=sys-devel/clang-6 )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -67,13 +64,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( @@ -98,7 +88,7 @@ multilib_src_configure() { use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" - -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DOPENMP_LIT_ARGS="$(get_lit_flags)" -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"