Update to upstream patch wrt #339216 by Nicolas Dufresne.

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

2 files changed, 34 insertions, 20 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 937c9e21701a..bd5c04580af2 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.40 2010/09/30 18:08:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.41 2010/10/28 09:20:32 ssuominen Exp $
+
+  28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/libproxy-0.4.6-mozjs-link_directory.patch:
+  Update to upstream patch wrt #339216 by Nicolas Dufresne.
 
   30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> libproxy-0.4.6.ebuild,
   +files/libproxy-0.4.6-mozjs-link_directory.patch:
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
index 6c24f29edd5d..cab138e2eaed 100644
--- 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
@@ -1,20 +1,30 @@
-http://bugs.gentoo.org/339216
+From 18fbf794ffc2cab9f4b8df3c4132b094fc4ef281 Mon Sep 17 00:00:00 2001
+From: nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56>
+Date: Tue, 12 Oct 2010 17:39:18 +0000
+Subject: [PATCH 1/2] Disable transient linking
+
+As explained at
+http://www.cmake.org/Wiki/CMake_FAQ#Why_do_I_have_unwanted_semicolons_.3B_in_my_compiler_flags.3F
+if CMake links A to B and B to C, all the flags from A will be appended when
+C is linked. This behaviour is wrong, but CMake provides a workaround which
+is implemented in this patch.
+
+git-svn-id: https://libproxy.googlecode.com/svn/trunk@774 c587cffe-e639-0410-9787-d7902ae8ed56
+---
+ libproxy/cmake/libproxy.cmk |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk
+index 5625d4e..dc9fa0f 100644
+--- a/libproxy/cmake/libproxy.cmk
++++ b/libproxy/cmake/libproxy.cmk
+@@ -18,5 +18,6 @@ endif()
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
+              PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
+ set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
++set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
+-- 
+1.7.2.3
 
---- 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)