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 3D555139084 for ; Mon, 18 Dec 2017 14:04:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 475ADE0FBE; Mon, 18 Dec 2017 14:04:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1558BE0FBA for ; Mon, 18 Dec 2017 14:04:04 +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 27E2E33BF51 for ; Mon, 18 Dec 2017 14:04:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 236DAAE90 for ; Mon, 18 Dec 2017 14:04:00 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1513605828.6e60a103a50eec1db3986d2e626e6bc05b56feda.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/charm/charm-6.7.1.ebuild X-VCS-Directories: sys-cluster/charm/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 6e60a103a50eec1db3986d2e626e6bc05b56feda X-VCS-Branch: master Date: Mon, 18 Dec 2017 14:04:00 +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: 59c86b84-a620-4952-9766-5ec1a79e4e40 X-Archives-Hash: 98c9eb40c9dd2ed0a593cbcd6bab2e63 commit: 6e60a103a50eec1db3986d2e626e6bc05b56feda Author: Justin Lecher gentoo org> AuthorDate: Sun Dec 17 20:41:58 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Dec 18 14:03:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e60a103 sys-cluster/charm: Fix for new rpc situation Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-cluster/charm/charm-6.7.1.ebuild | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys-cluster/charm/charm-6.7.1.ebuild b/sys-cluster/charm/charm-6.7.1.ebuild index 1f2d2300a74..47af0637e8b 100644 --- a/sys-cluster/charm/charm-6.7.1.ebuild +++ b/sys-cluster/charm/charm-6.7.1.ebuild @@ -30,7 +30,9 @@ DEPEND=" ') media-libs/netpbm ${PYTHON_DEPS} - )" + ) + net-libs/libtirpc + " REQUIRED_USE=" cmkopt? ( !charmdebug !charmtracing ) @@ -73,20 +75,22 @@ get_opts() { } src_prepare() { + append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc) + sed \ - -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \ - -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ + -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \ + -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ -e "/CMK_CF90/s:\`which f90.*$::g" \ - -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ - -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ + -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \ + -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \ -e '/CMK_F90_MODINC/s:-p:-I:g' \ -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die sed \ - -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ - -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ - -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ - -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ + -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ + -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ + -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ + -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ -i src/arch/common/*.sh || die sed \ @@ -97,6 +101,7 @@ src_prepare() { -e "s:-o charmrun:${LDFLAGS} &:g" \ -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ -e "s:-o charmd:${LDFLAGS} &:g" \ + -e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \ -i \ src/scripts/Makefile \ src/util/charmrun-src/Makefile || die