| 1 |
ssuominen 10/10/28 09:20:32 |
| 2 |
|
| 3 |
Modified: libproxy-0.4.6-mozjs-link_directory.patch |
| 4 |
Log: |
| 5 |
Update to upstream patch wrt #339216 by Nicolas Dufresne. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: libproxy-0.4.6-mozjs-link_directory.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libproxy-0.4.6-mozjs-link_directory.patch 30 Sep 2010 18:08:02 -0000 1.1 |
| 23 |
+++ libproxy-0.4.6-mozjs-link_directory.patch 28 Oct 2010 09:20:32 -0000 1.2 |
| 24 |
@@ -1,20 +1,30 @@ |
| 25 |
-http://bugs.gentoo.org/339216 |
| 26 |
+From 18fbf794ffc2cab9f4b8df3c4132b094fc4ef281 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> |
| 28 |
+Date: Tue, 12 Oct 2010 17:39:18 +0000 |
| 29 |
+Subject: [PATCH 1/2] Disable transient linking |
| 30 |
+ |
| 31 |
+As explained at |
| 32 |
+http://www.cmake.org/Wiki/CMake_FAQ#Why_do_I_have_unwanted_semicolons_.3B_in_my_compiler_flags.3F |
| 33 |
+if CMake links A to B and B to C, all the flags from A will be appended when |
| 34 |
+C is linked. This behaviour is wrong, but CMake provides a workaround which |
| 35 |
+is implemented in this patch. |
| 36 |
+ |
| 37 |
+git-svn-id: https://libproxy.googlecode.com/svn/trunk@774 c587cffe-e639-0410-9787-d7902ae8ed56 |
| 38 |
+--- |
| 39 |
+ libproxy/cmake/libproxy.cmk | 1 + |
| 40 |
+ 1 files changed, 1 insertions(+), 0 deletions(-) |
| 41 |
+ |
| 42 |
+diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk |
| 43 |
+index 5625d4e..dc9fa0f 100644 |
| 44 |
+--- a/libproxy/cmake/libproxy.cmk |
| 45 |
++++ b/libproxy/cmake/libproxy.cmk |
| 46 |
+@@ -18,5 +18,6 @@ endif() |
| 47 |
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp |
| 48 |
+ PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) |
| 49 |
+ set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) |
| 50 |
++set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") |
| 51 |
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) |
| 52 |
+ install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) |
| 53 |
+-- |
| 54 |
+1.7.2.3 |
| 55 |
|
| 56 |
---- bindings/perl/src/CMakeLists.txt |
| 57 |
-+++ bindings/perl/src/CMakeLists.txt |
| 58 |
-@@ -1,5 +1,5 @@ |
| 59 |
- include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/libproxy ) |
| 60 |
--link_directories(${LIBPROXY_LIBRARY_DIRS}) |
| 61 |
-+link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS}) |
| 62 |
- |
| 63 |
- # Run doxsubpp.pl to run xsubpp on Libproxy.xs |
| 64 |
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c |
| 65 |
---- utils/CMakeLists.txt |
| 66 |
-+++ utils/CMakeLists.txt |
| 67 |
-@@ -1,5 +1,5 @@ |
| 68 |
- include_directories("../libproxy") |
| 69 |
--link_directories(${LIBPROXY_LIBRARY_DIRS}) |
| 70 |
-+link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS}) |
| 71 |
- |
| 72 |
- add_executable(proxy proxy.c) |
| 73 |
- target_link_libraries(proxy libproxy) |
Archives