[patch] Patch for trilinos-10.12.2.ebuild, 2nd version

trilinos-10.12.2.ebuild.patch (text/plain), 1.74 KB, created by Matthias Maier on 2012-11-12 17:08:24 UTC

--- /home/people/maier/gentoo-prefix.NOBACKUP/var/lib/layman/science/sci-libs/trilinos/trilinos-10.10.1.ebuild	2012-10-04 19:16:13.000000000 +0200
+++ /home/people/maier/gentoo-prefix.NOBACKUP/usr/local/portage/sci-libs/trilinos/trilinos-10.12.2.ebuild	2012-11-12 17:36:54.000000000 +0100
@@ -7,8 +7,8 @@
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.gz"
-SRC_PAGE="10.10"
+SRC_URI="${P}-Source.tar.bz2"
+SRC_PAGE="10.12"
 
 KEYWORDS="~amd64 ~x86"
 RESTRICT="fetch"
@@ -65,16 +65,21 @@
 	)
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+}
+
 src_configure() {
 	CMAKE_BUILD_TYPE="release"
+
 	mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-	
-		# Directories (workaround for generating correct Makefiles and CMakefiles)
-		-DCMAKE_INSTALL_PREFIX="/"
-		-DTrilinos_INSTALL_INCLUDE_DIR="/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="/usr/$(get_libdir)/trilinos"
+
+		-DTrilinos_INSTALL_BIN_DIR="bin"
+		-DTrilinos_INSTALL_CONFIG_DIR="$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="$(get_libdir)"
 
 		# Tests
 		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
@@ -107,7 +112,7 @@
 
 	# Scotch libraries
 	if use scotch; then
-		mycmakeargs+=( -DScotch_INCLUDE_DIRS="/usr/include/scotch" )
+		mycmakeargs+=( -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" )
 	fi
 
 	# Add BLAS libraries
@@ -116,7 +121,7 @@
 	trilinos_alternatives scalapack SCALAPACK
 	trilinos_alternatives scalapack BLACS
 
-	mycmakeargs+=( -DBLACS_INCLUDE_DIRS="/usr/include/blacs" )
+	mycmakeargs+=( -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" )
 
 	cmake-utils_src_configure
 }