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 5978D139085 for ; Tue, 10 Jan 2017 05:27:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94FC0E0D4A; Tue, 10 Jan 2017 05:27:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74539E0D49 for ; Tue, 10 Jan 2017 05:27:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 658F734106E for ; Tue, 10 Jan 2017 05:27:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14044262B for ; Tue, 10 Jan 2017 05:27:21 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1484026000.02a4bcaa2cb79940af4b8fc89ae31aa95bad0257.bicatali@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libdynd/libdynd-0.7.2.ebuild X-VCS-Directories: dev-libs/libdynd/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 02a4bcaa2cb79940af4b8fc89ae31aa95bad0257 X-VCS-Branch: master Date: Tue, 10 Jan 2017 05:27:21 +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-Archives-Salt: 7cfffa8a-7cc9-41d6-8b9d-761b0fa607c5 X-Archives-Hash: d40c27051a1c29d225f5016ee5e9fb87 commit: 02a4bcaa2cb79940af4b8fc89ae31aa95bad0257 Author: Sébastien Fabbro gentoo org> AuthorDate: Sun Jan 8 22:17:42 2017 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Jan 10 05:26:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a4bcaa dev-libs/libdynd: fix the git version mangling also add cuda sanitizing, and basic cleaning Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/libdynd/libdynd-0.7.2.ebuild | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild index 37b608c..0ca75be 100644 --- a/dev-libs/libdynd/libdynd-0.7.2.ebuild +++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild @@ -6,6 +6,9 @@ EAPI=6 inherit cmake-utils cuda +# change each new libdynd version, to avoid git in tree dependency +DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b + DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure" HOMEPAGE="http://libdynd.org" SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -27,7 +30,7 @@ DEPEND="${RDEPEND} DOCS=( README.md ) src_prepare() { - #use cuda && cuda_src_prepare + use cuda && cuda_src_prepare cmake-utils_src_prepare cmake_comment_add_subdirectory examples # fix forced cxxflags and doc installation directory @@ -39,6 +42,15 @@ src_prepare() { sed -e 's|install(TARGETS test_libdynd||' \ -e 's|RUNTIME DESTINATION bin)||' \ -i tests/CMakeLists.txt || die + + # remove the version mangling from git stuff it requires a git clone + # rather force set it a configure time + sed -e '/GetGitRev/d' \ + -e '/get_git_/d' \ + -e '/git_describe/d' \ + -e '/dirty/d' \ + -i CMakeLists.txt || die + sed -e s||${DYND_SHA1_VERSION}| # not tested if use mkl; then sed -e "s|/opt/intel/.*|$(ls -1d ${EPREFIX}/opt/intel/compilers*)|" \ @@ -48,6 +60,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DDYND_GIT_SHA1="${DYND_GIT_SHA1}" + -DDYND_VERSION_STRING="v${PV}" -DDYND_INSTALL_LIB=ON -DDYND_SHARED_LIB=ON -DDYND_BUILD_BENCHMARKS=OFF @@ -56,7 +70,7 @@ src_configure() { -DDYND_BUILD_TESTS="$(usex test)" -DDYND_CUDA="$(usex cuda)" -DDYND_FFTW="$(usex fftw)" - -DFFTW_PATH="${EPREFIX}/usr" + -DFFTW_PATH="${EPREFIX}/usr/include" ) cmake-utils_src_configure }