From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SH1Qz-0004iL-UQ for garchives@archives.gentoo.org; Sun, 08 Apr 2012 23:22:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51201E062D; Sun, 8 Apr 2012 23:22:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0F97AE062D for ; Sun, 8 Apr 2012 23:22:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22EC51B4012 for ; Sun, 8 Apr 2012 23:22:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0AD39E5402 for ; Sun, 8 Apr 2012 23:22:03 +0000 (UTC) From: "Andrea Arteaga" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrea Arteaga" Message-ID: <1333927149.b56b7b4f7966a5434723ed52dd097d0d41a54f4f.spiros@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/trilinos/ChangeLog sci-libs/trilinos/trilinos-10.10.1.ebuild X-VCS-Directories: sci-libs/trilinos/ X-VCS-Committer: spiros X-VCS-Committer-Name: Andrea Arteaga X-VCS-Revision: b56b7b4f7966a5434723ed52dd097d0d41a54f4f X-VCS-Branch: master Date: Sun, 8 Apr 2012 23:22:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 545bbafa-eeca-4bac-9f13-efeb21e50ed9 X-Archives-Hash: c3d3fc58fb721686512504258015e3cc commit: b56b7b4f7966a5434723ed52dd097d0d41a54f4f Author: Andrea Arteaga gmail com> AuthorDate: Sun Apr 8 23:19:09 2012 +0000 Commit: Andrea Arteaga gmail com> CommitDate: Sun Apr 8 23:19:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db56b7b4f [sci-libs/trilinos] Solved many issues. --- sci-libs/trilinos/ChangeLog | 4 ++ sci-libs/trilinos/trilinos-10.10.1.ebuild | 55 +++--------------------= ------ 2 files changed, 9 insertions(+), 50 deletions(-) diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog index ad9f45d..6c94090 100644 --- a/sci-libs/trilinos/ChangeLog +++ b/sci-libs/trilinos/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 9 Apr 2012; Andrea Arteaga + trilinos-10.10.1.ebuild +metadata.xml: + Solved many issues. + *trilinos-10.10.1 (8 Apr 2012) =20 8 Apr 2012; Andrea Arteaga diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilino= s/trilinos-10.10.1.ebuild index 9cae14b..7b964e4 100644 --- a/sci-libs/trilinos/trilinos-10.10.1.ebuild +++ b/sci-libs/trilinos/trilinos-10.10.1.ebuild @@ -68,6 +68,11 @@ src_configure() { mycmakeargs=3D( -DBUILD_SHARED_LIBS=3DON -DTrilinos_ENABLE_ALL_PACKAGES=3DON + =09 + # Directories (workaround for generating correct Makefiles and CMakefi= les) + -DCMAKE_INSTALL_PREFIX=3D"/" + -DTrilinos_INSTALL_INCLUDE_DIR=3D"/usr/include/trilinos" + -DTrilinos_INSTALL_LIB_DIR=3D"/usr/$(get_libdir)/trilinos" =20 # Tests $(cmake-utils_use test Trilinos_ENABLE_TESTS) @@ -104,53 +109,3 @@ src_configure() { =20 cmake-utils_src_configure } - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - local k - local fname - local libpath - local tpkg - - # Edit cmake files - libpath=3D"/usr/$(get_libdir)/Trilinos" - pushd "${D}/usr/lib/cmake" - for i in *; do - fname=3D"${i}/${i}Config.cmake" - - k=3D$(grep -n "${i}_INCLUDE_DIRS" "${fname}" | sed 's/\([0-9]*\):.*/\1/= ') - sed "${k}s|/usr/include|/usr/include/Trilinos|" < "${fname}" > "${fname= }.temp" - - k=3D$(grep -n "${i}_LIBRARY_DIRS" "${fname}" | sed 's/\([0-9]*\):.*/\1/= ') - sed "${k}s|/usr/lib|${libpath}|" < "${fname}.temp" > "${fname}" - - rm "${fname}.temp" - done - popd - - # Edit Makefiles - pushd "${D}/usr/include" - for i in Makefile.export.*; do - tpkg=3D"$(echo ${i} | sed 's/Makefile.export.//')" - - sed "s|${tpkg}_INCLUDE_DIRS=3D -I/usr/include|${tpkg}_INCLUDE_DIRS=3D -= I/usr/include/Trilinos|" < "Makefile.export.${tpkg}" > "Makefile.export.$= {tpkg}.temp" - sed "s|${tpkg}_LIBRARY_DIRS=3D -L/usr/lib|${tpkg}_LIBRARY_DIRS=3D -L${l= ibpath}|" < "Makefile.export.${tpkg}.temp" > "Makefile.export.${tpkg}" - rm "Makefile.export.${tpkg}.temp" - done - popd - - - # Move libraries - mkdir -p "${D}/${libpath}" - mv ${D}usr/lib/*.so "${D}/${libpath}" - - # Move headers - mkdir "${T}/headers" - mv ${D}usr/include/* "${T}/headers" - mv "${T}/headers" "${D}/usr/include/Trilinos" -}