[patch] Patch against openjpeg-2.1.0.ebuild

openjpeg-multilib.patch (text/plain), 1.43 KB, created by James Le Cuirot on 2015-04-30 09:43:09 UTC

--- openjpeg-2.1.0.ebuild	2014-11-01 17:46:51.000000000 +0000
+++ openjpeg-2.1.0-r1.ebuild	2015-04-30 10:36:57.000000000 +0100
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-2.1.0.ebuild,v 1.12 2014/11/01 17:46:51 ago Exp $
 
 EAPI=5
-inherit cmake-utils multilib
+inherit multilib cmake-multilib
 
 DESCRIPTION="An open-source JPEG 2000 library"
 HOMEPAGE="http://code.google.com/p/openjpeg/"
@@ -30,11 +30,12 @@
 	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		$(cmake-utils_use_build doc)
 		$(cmake-utils_use_build test TESTING)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
 		)
 
 	cmake-utils_src_configure
@@ -43,13 +44,14 @@
 		mycmakeargs=(
 			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
 			$(cmake-utils_use_build test TESTING)
+			-DBUILD_CODEC=OFF
 			-DBUILD_SHARED_LIBS=OFF
 			)
 		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
 	fi
 }
 
-src_compile() {
+multilib_src_compile() {
 	cmake-utils_src_compile
 
 	if use static-libs; then
@@ -57,10 +59,9 @@
 	fi
 }
 
-src_install() {
+multilib_src_install() {
 	if use static-libs; then
 		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-		#static bins overwritten by shared install
 	fi
 
 	cmake-utils_src_install