patches/libproxy-01-build.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18237 8f080350cdb9
child 20304 ff939de01fdf
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     1
diff -ur libproxy-0.4.2-old/CMakeLists.txt libproxy-0.4.2-new/CMakeLists.txt
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     2
--- libproxy-0.4.2-old/CMakeLists.txt	2010-05-20 02:01:34.000000000 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     3
+++ libproxy-0.4.2-new/CMakeLists.txt	2010-07-15 14:13:10.285822401 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     4
@@ -59,7 +59,8 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     5
   add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     6
 else()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     7
   add_definitions(-D_POSIX_C_SOURCE=1)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     8
-  set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -Os ${CMAKE_CXX_FLAGS}")
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
     9
+  add_definitions(-D__EXTENSIONS__)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    10
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    11
 endif()
16538
bb8aa3bf5fd0 2009-09-11 Ke Wang <[email protected]>
wangke
parents:
diff changeset
    12
 
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    13
 ### Subdirectories
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    14
diff -ur libproxy-0.4.2-old/libmodman/CMakeLists.txt libproxy-0.4.2-new/libmodman/CMakeLists.txt
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    15
--- libproxy-0.4.2-old/libmodman/CMakeLists.txt	2010-05-20 02:01:34.000000000 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    16
+++ libproxy-0.4.2-new/libmodman/CMakeLists.txt	2010-07-15 14:22:21.779742462 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    17
@@ -14,7 +14,7 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    18
     file(MAKE_DIRECTORY test/modules/${MODTYPE})
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    19
   endif()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    20
   include_directories(../)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    21
-  add_library(${MODTYPE}_${MODNAME} MODULE libmodman/test/${MODTYPE}_${MODNAME}.cpp)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    22
+  add_library(${MODTYPE}_${MODNAME} MODULE test/${MODTYPE}_${MODNAME}.cpp)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    23
   set_target_properties(${MODTYPE}_${MODNAME} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY test/modules/${MODTYPE})
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    24
   target_link_libraries(${MODTYPE}_${MODNAME} libmodman)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    25
 endfunction(mm_create_module)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    26
@@ -55,7 +55,7 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    27
 else()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    28
 mm_create_program(symbollnk symbol z)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    29
 endif()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    30
-add_executable(builtin test/builtin.cpp libmodman/test/builtin_one.cpp)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    31
+add_executable(builtin test/builtin.cpp test/builtin_one.cpp)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    32
 target_link_libraries(builtin libmodman)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    33
 set_property(TARGET builtin PROPERTY COMPILE_DEFINITIONS EXTTYPE=builtin_extension;BUILTIN_MODULE="extension";MM_MODULE_BUILTIN=extension)
16538
bb8aa3bf5fd0 2009-09-11 Ke Wang <[email protected]>
wangke
parents:
diff changeset
    34
 
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    35
diff -ur libproxy-0.4.2-old/libmodman/module.hpp libproxy-0.4.2-new/libmodman/module.hpp
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    36
--- libproxy-0.4.2-old/libmodman/module.hpp	2010-05-20 02:01:34.000000000 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    37
+++ libproxy-0.4.2-new/libmodman/module.hpp	2010-07-15 14:15:49.467848815 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    38
@@ -32,7 +32,11 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    39
 #define __MM_SCLR_DEF_PREFIX extern "C" __MM_DLL_EXPORT
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    40
 #else
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    41
 #include <typeinfo>
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    42
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    43
+#define __MM_DLL_EXPORT __global
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    44
+#else
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    45
 #define __MM_DLL_EXPORT __attribute__ ((visibility("default")))
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    46
+#endif
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    47
 #define __MM_FUNC_DEF_PREFIX            __MM_DLL_EXPORT
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    48
 #define __MM_SCLR_DEF_PREFIX extern "C" __MM_DLL_EXPORT
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    49
 #endif
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    50
diff -ur libproxy-0.4.2-old/libproxy/CMakeLists.txt libproxy-0.4.2-new/libproxy/CMakeLists.txt
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    51
--- libproxy-0.4.2-old/libproxy/CMakeLists.txt	2010-05-20 02:01:34.000000000 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    52
+++ libproxy-0.4.2-new/libproxy/CMakeLists.txt	2010-07-15 14:17:36.574924645 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    53
@@ -119,11 +119,7 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    54
   endif()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    55
 endif()
16538
bb8aa3bf5fd0 2009-09-11 Ke Wang <[email protected]>
wangke
parents:
diff changeset
    56
 
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    57
-# Build the pacrunner into libproxy unless we are building for multiple engines
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    58
-set(BIPR 1)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    59
-if(MOZJS_FOUND AND WEBKIT_FOUND)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    60
-  set(BIPR 0)
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    61
-endif()
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    62
+set(BIPR 0)
16538
bb8aa3bf5fd0 2009-09-11 Ke Wang <[email protected]>
wangke
parents:
diff changeset
    63
 
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    64
 # Add link directories all at once and make it available globally.
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    65
 link_directories(${LIBPROXY_LIBRARY_DIRS})
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    66
diff -ur libproxy-0.4.2-old/libproxy/url.hpp libproxy-0.4.2-new/libproxy/url.hpp
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    67
--- libproxy-0.4.2-old/libproxy/url.hpp	2010-05-20 02:01:34.000000000 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    68
+++ libproxy-0.4.2-new/libproxy/url.hpp	2010-07-15 14:28:27.182159731 +0800
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    69
@@ -20,6 +20,8 @@
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    70
 #ifndef URL_HPP_
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    71
 #define URL_HPP_
16538
bb8aa3bf5fd0 2009-09-11 Ke Wang <[email protected]>
wangke
parents:
diff changeset
    72
 
18237
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    73
+#include <unistd.h>
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    74
+
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    75
 #include <map>
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    76
 #include <stdexcept>
8f080350cdb9 2010-07-15 Ke Wang <[email protected]>
wangke
parents: 16785
diff changeset
    77
 #include <string>