diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-30 18:08:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-30 18:08:02 +0000 |
| commit | 163224d9876985c198d4c915dccaca4c3ed72bcc (patch) | |
| tree | 262d9a9149915693f8655800702c36d457c84445 /net-libs/libproxy | |
| parent | Version bump. (diff) | |
| download | gentoo-2-163224d9876985c198d4c915dccaca4c3ed72bcc.tar.gz gentoo-2-163224d9876985c198d4c915dccaca4c3ed72bcc.tar.bz2 gentoo-2-163224d9876985c198d4c915dccaca4c3ed72bcc.zip | |
Fix missing link directories for mozjs wrt #339216 by "DaggyStyle".
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libproxy')
| -rw-r--r-- | net-libs/libproxy/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch | 20 | ||||
| -rw-r--r-- | net-libs/libproxy/libproxy-0.4.6.ebuild | 10 |
3 files changed, 28 insertions, 8 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog index 3ec61511cf53..937c9e21701a 100644 --- a/net-libs/libproxy/ChangeLog +++ b/net-libs/libproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libproxy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.39 2010/09/29 20:43:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.40 2010/09/30 18:08:02 ssuominen Exp $ + + 30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> libproxy-0.4.6.ebuild, + +files/libproxy-0.4.6-mozjs-link_directory.patch: + Fix missing link directories for mozjs wrt #339216 by "DaggyStyle". *libproxy-0.4.6 (29 Sep 2010) diff --git a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch b/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch new file mode 100644 index 000000000000..6c24f29edd5d --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch @@ -0,0 +1,20 @@ +http://bugs.gentoo.org/339216 + +--- bindings/perl/src/CMakeLists.txt ++++ bindings/perl/src/CMakeLists.txt +@@ -1,5 +1,5 @@ + include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/libproxy ) +-link_directories(${LIBPROXY_LIBRARY_DIRS}) ++link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS}) + + # Run doxsubpp.pl to run xsubpp on Libproxy.xs + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c +--- utils/CMakeLists.txt ++++ utils/CMakeLists.txt +@@ -1,5 +1,5 @@ + include_directories("../libproxy") +-link_directories(${LIBPROXY_LIBRARY_DIRS}) ++link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS}) + + add_executable(proxy proxy.c) + target_link_libraries(proxy libproxy) diff --git a/net-libs/libproxy/libproxy-0.4.6.ebuild b/net-libs/libproxy/libproxy-0.4.6.ebuild index e4a4ca4cc86c..e9fb2a3e811b 100644 --- a/net-libs/libproxy/libproxy-0.4.6.ebuild +++ b/net-libs/libproxy/libproxy-0.4.6.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.1 2010/09/29 20:43:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.2 2010/09/30 18:08:02 ssuominen Exp $ EAPI="2" -CMAKE_MIN_VERSION="2.6" PYTHON_DEPEND="python? 2:2.5" inherit cmake-utils eutils multilib python portability @@ -32,17 +31,14 @@ DEPEND="${RDEPEND} DOCS="AUTHORS NEWS README ChangeLog" +PATCHES=( "${FILESDIR}"/${P}-mozjs-link_directory.patch ) + pkg_setup() { if use python; then python_set_active_version 2 fi } -src_prepare() { - base_src_prepare - epatch "${FILESDIR}"/${PN}-0.4.2-glibc212.patch -} - src_configure() { mycmakeargs=( -DPERL_VENDORINSTALL=ON |