diff options
| author |   Markus Meier <maekke@gentoo.org> | 2008-08-18 16:38:03 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2008-08-18 16:38:03 +0000 |
| commit | 29923dd41259b3bc2b83bfa04b5c32c1949a9fcd (patch) | |
| tree | db2e01deeb6da4fe4b150769c1c031239f9b60fe /media-gfx/hugin | |
| parent | bin86 is a build-time dependency, not a run-time dependency. Closes bug #2215... (diff) | |
| download | gentoo-2-29923dd41259b3bc2b83bfa04b5c32c1949a9fcd.tar.gz gentoo-2-29923dd41259b3bc2b83bfa04b5c32c1949a9fcd.tar.bz2 gentoo-2-29923dd41259b3bc2b83bfa04b5c32c1949a9fcd.zip | |
fix building with --as-needed, bug #235004
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc2 i686)
Diffstat (limited to 'media-gfx/hugin')
| -rw-r--r-- | media-gfx/hugin/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch | 34 | ||||
| -rw-r--r-- | media-gfx/hugin/hugin-0.7.0_rc2.ebuild | 8 |
3 files changed, 46 insertions, 2 deletions
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog index 9888eb09ae1c..357f117f22fb 100644 --- a/media-gfx/hugin/ChangeLog +++ b/media-gfx/hugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.40 2008/08/16 11:22:07 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.41 2008/08/18 16:38:02 maekke Exp $ + + 18 Aug 2008; Markus Meier <maekke@gentoo.org> + +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild: + fix building with --as-needed, bug #235004 *hugin-0.7.0_rc2 (16 Aug 2008) diff --git a/media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch b/media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch new file mode 100644 index 000000000000..7ca238a6bdac --- /dev/null +++ b/media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch @@ -0,0 +1,34 @@ +patch from http://sourceforge.net/tracker/index.php?func=detail&aid=1979840&group_id=77506&atid=550443 + +--- a/src/hugin_base/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000 ++++ b/src/hugin_base/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000 +@@ -64,3 +64,5 @@ + ENDIF (${HUGIN_SHARED_LIBS}) + + add_subdirectory(test) ++ ++TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES}) +--- a/src/foreign/vigra/vigra_impex/CMakeLists.txt 2008-01-27 22:07:35.000000000 +0000 ++++ b/src/foreign/vigra/vigra_impex/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000 +@@ -9,3 +9,5 @@ + ELSE (${HUGIN_SHARED_LIBS}) + add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC}) + ENDIF (${HUGIN_SHARED_LIBS}) ++ ++TARGET_LINK_LIBRARIES(huginvigraimpex ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES}) +--- a/src/foreign/jhead/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000 ++++ b/src/foreign/jhead/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000 +@@ -7,3 +7,5 @@ + ELSE (${HUGIN_SHARED_LIBS}) + add_library(huginjhead STATIC ${HUGIN_JHEAD_SRC}) + ENDIF (${HUGIN_SHARED_LIBS}) ++ ++TARGET_LINK_LIBRARIES(huginjhead huginbase) +--- a/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:18:25.000000000 +0000 ++++ b/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:21:28.000000000 +0000 +@@ -1,3 +1,5 @@ + + add_library(huginlevmar STATIC lm.c Axb.c misc.c lmlec.c lmbc.c) + ++SET_TARGET_PROPERTIES(huginlevmar PROPERTIES COMPILE_FLAGS -fPIC) ++ diff --git a/media-gfx/hugin/hugin-0.7.0_rc2.ebuild b/media-gfx/hugin/hugin-0.7.0_rc2.ebuild index 0f9fbc51c9fa..714c7356776b 100644 --- a/media-gfx/hugin/hugin-0.7.0_rc2.ebuild +++ b/media-gfx/hugin/hugin-0.7.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0_rc2.ebuild,v 1.1 2008/08/16 11:22:07 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0_rc2.ebuild,v 1.2 2008/08/18 16:38:02 maekke Exp $ EAPI="1" WX_GTK_VER="2.8" @@ -38,3 +38,9 @@ pkg_setup() { die "$msg" fi } + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-as-needed.patch +} |