From ff7f4ad6fa7244f7b5b1fcd0f78cc771f40a902f Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 15 Sep 2009 08:39:44 +0000 Subject: Fix mulitilib issues per bug #284929. (Portage version: 2.2_rc38/cvs/Linux i686) --- sci-libs/indilib/ChangeLog | 6 +++++- sci-libs/indilib/files/0.6-multilib.patch | 21 +++++++++++++++++++++ sci-libs/indilib/indilib-0.6.ebuild | 3 ++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 sci-libs/indilib/files/0.6-multilib.patch (limited to 'sci-libs') diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog index c37a30e4a7d9..ac17813ddbad 100644 --- a/sci-libs/indilib/ChangeLog +++ b/sci-libs/indilib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/indilib # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.6 2009/09/07 11:03:07 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.7 2009/09/15 08:39:44 scarabeus Exp $ + + 15 Sep 2009; Tomáš Chvátal + +files/0.6-multilib.patch, indilib-0.6.ebuild: + Fix mulitilib issues per bug #284929. 07 Sep 2009; Tomáš Chvátal indilib-0.6.ebuild, metadata.xml: diff --git a/sci-libs/indilib/files/0.6-multilib.patch b/sci-libs/indilib/files/0.6-multilib.patch new file mode 100644 index 000000000000..3f7ab720f2fb --- /dev/null +++ b/sci-libs/indilib/files/0.6-multilib.patch @@ -0,0 +1,21 @@ +diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt +--- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100 ++++ libindi0-0.6/CMakeLists.txt 2009-09-15 10:35:17.000000000 +0200 +@@ -96,7 +96,7 @@ + ######## INDI Static Library ######### + ###################################### + add_library(indidriver STATIC ${indimain_SRCS}) +-install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX}) ++install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX}) + + ###################################### + ######## INDI Shared Library ######### +@@ -114,7 +114,7 @@ + target_link_libraries(indi ${FLI_LIBRARIES}) + endif(FLI_FOUND) + +-install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX}) ++install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX}) + set_target_properties(indi PROPERTIES VERSION ${INDI_VERSION} SOVERSION ${INDI_SOVERSION}) + + ##################################### diff --git a/sci-libs/indilib/indilib-0.6.ebuild b/sci-libs/indilib/indilib-0.6.ebuild index cd9511c698c7..44a425aa0d89 100644 --- a/sci-libs/indilib/indilib-0.6.ebuild +++ b/sci-libs/indilib/indilib-0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.6.ebuild,v 1.2 2009/09/07 11:03:07 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.6.ebuild,v 1.3 2009/09/15 08:39:44 scarabeus Exp $ EAPI="2" @@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P/_/-}" PATCHES=( "${FILESDIR}"/${PV}-fix_symlink.patch + "${FILESDIR}"/${PV}-multilib.patch ) src_configure() { -- cgit v1.2.3-65-gdbad