From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 23E5B138A1A for ; Sat, 21 Feb 2015 00:05:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95E81E083D; Sat, 21 Feb 2015 00:05:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 665E5E0858 for ; Sat, 21 Feb 2015 00:05:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F935340B66 for ; Fri, 20 Feb 2015 16:57:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC53E122DC for ; Fri, 20 Feb 2015 16:57:20 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1424451345.e3636e5fd50334e2319f42059a2ff8d72610db20.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/openmpi/ChangeLog sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild X-VCS-Directories: sys-cluster/openmpi/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: e3636e5fd50334e2319f42059a2ff8d72610db20 X-VCS-Branch: master Date: Fri, 20 Feb 2015 16:57:20 +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: e5faa35a-59ae-40de-96ac-ba44cc0d65bb X-Archives-Hash: 95b789a223bbe56ffeb681ba24505ff5 commit: e3636e5fd50334e2319f42059a2ff8d72610db20 Author: Christoph Junghans gentoo org> AuthorDate: Fri Feb 20 16:55:45 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Fri Feb 20 16:55:45 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3636e5f added fortran hack for bug #540508 Package-Manager: portage-2.2.14 --- sys-cluster/openmpi/ChangeLog | 3 +++ sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog index 99406f7..ba79a0b 100644 --- a/sys-cluster/openmpi/ChangeLog +++ b/sys-cluster/openmpi/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Feb 2015; Christoph Junghans openmpi-1.8.4-r3.ebuild: + added fortran hack for bug #540508 + *openmpi-1.8.4-r3 (19 Feb 2015) 19 Feb 2015; Christoph Junghans +openmpi-1.8.4-r3.ebuild, diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild index 7822097..306bede 100644 --- a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild @@ -75,14 +75,7 @@ RDEPEND=" DEPEND="${RDEPEND}" MULTILIB_WRAPPED_HEADERS=( - /usr/include/mpif-io-handles.h - /usr/include/mpif-constants.h /usr/include/mpi.h - /usr/include/mpif-externals.h - /usr/include/mpif-io-constants.h - /usr/include/mpif-config.h - /usr/include/mpif-sentinels.h - /usr/include/mpif-handles.h ) pkg_setup() { @@ -165,12 +158,23 @@ multilib_src_install() { # Remove la files, no static libs are installed and we have pkg-config find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete + + # fortran header cannot be wrapped (bug #540508), workaround part 1 + if multilib_is_native_abi && use fortran; then + mkdir "${T}"/fortran || die + mv "${ED}"/usr/include/mpif* "${T}"/fortran || die + fi } multilib_src_install_all() { # From USE=vt see #359917 rm "${ED}"/usr/share/libtool &> /dev/null + # fortran header cannot be wrapped (bug #540508), workaround part 2 + if use fortran; then + mv "${T}"/fortran/mpif* "${ED}"/usr/include || die + fi + # Avoid collisions with libevent rm -rf "${ED}"/usr/include/event2 &> /dev/null