1 |
loki_val 08/12/03 00:41:47 |
2 |
|
3 |
Added: xmlrpc-c-1.16.06-no-undefined.patch |
4 |
Removed: xmlrpc-c-1.16.04-linking-order.patch |
5 |
xmlrpc-c-1.16.04-cpplinking.patch |
6 |
xmlrpc-c-1.16.04-abyss-disable.patch |
7 |
xmlrpc-c-1.16.04-compile.patch |
8 |
Log: |
9 |
Add new version. Upstream accepted our fixes from .04. New fixes included fixing bug 246749. |
10 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-no-undefined.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-no-undefined.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-no-undefined.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: xmlrpc-c-1.16.06-no-undefined.patch |
19 |
=================================================================== |
20 |
diff -NrU5 xmlrpc-c-1.16.06.orig/src/cpp/Makefile xmlrpc-c-1.16.06/src/cpp/Makefile |
21 |
--- xmlrpc-c-1.16.06.orig/src/cpp/Makefile 2008-12-02 23:54:23.000000000 +0100 |
22 |
+++ xmlrpc-c-1.16.06/src/cpp/Makefile 2008-12-03 01:22:44.000000000 +0100 |
23 |
@@ -110,28 +110,33 @@ |
24 |
# shlibfn generates e.g. libxmlrpc.so.3.1 |
25 |
# shliblefn generates e.g. libxmlrpc.so |
26 |
|
27 |
LIBXMLRPC_CPP_SH = $(call shlibfn, libxmlrpc_cpp) |
28 |
|
29 |
-$(LIBXMLRPC_CPP_SH): XmlRpcCpp.osh |
30 |
+$(LIBXMLRPC_CPP_SH): XmlRpcCpp.osh \ |
31 |
+ $(LIBXMLRPC_UTIL) |
32 |
$(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh |
33 |
-$(LIBXMLRPC_CPP_SH): LIBDEP = -Lblddir/src -lxmlrpc |
34 |
+$(LIBXMLRPC_CPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -lxmlrpc_server -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util |
35 |
|
36 |
LIBXMLRPCPP_SH = $(call shlibfn, lib$(LIBXMLRPCPP_NAME)) |
37 |
|
38 |
$(LIBXMLRPCPP_SH): $(LIBXMLRPCPP_MODS:%=%.osh) \ |
39 |
- $(LIBXMLRPC) |
40 |
+ $(LIBXMLRPC) \ |
41 |
+ $(LIBXMLRPC_UTIL) |
42 |
$(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh) |
43 |
-$(LIBXMLRPCPP_SH): LIBDEP = -Lblddir/src -lxmlrpc |
44 |
+$(LIBXMLRPCPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util |
45 |
+ |
46 |
|
47 |
LIBXMLRPC_SERVERPP_SH = $(call shlibfn, libxmlrpc_server++) |
48 |
|
49 |
$(LIBXMLRPC_SERVERPP_SH): $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) \ |
50 |
$(LIBXMLRPC_SERVER) \ |
51 |
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ |
52 |
+ $(LIBXMLRPC_UTIL) \ |
53 |
$(LIBXMLRPC) |
54 |
$(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) |
55 |
-$(LIBXMLRPC_SERVERPP_SH): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc |
56 |
+$(LIBXMLRPC_SERVERPP_SH): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -l$(LIBXMLRPCPP_NAME) |
57 |
|
58 |
LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++) |
59 |
|
60 |
$(LIBXMLRPC_SERVER_ABYSSPP_SH): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) \ |
61 |
$(LIBXMLRPC_ABYSS) \ |
62 |
@@ -142,38 +147,46 @@ |
63 |
|
64 |
LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++) |
65 |
|
66 |
$(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \ |
67 |
$(call shliblefn, libxmlrpc_server++) \ |
68 |
- $(call shliblefn, libxmlrpc++) \ |
69 |
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ |
70 |
$(LIBXMLRPC) |
71 |
$(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) |
72 |
$(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \ |
73 |
- -L. -lxmlrpc_server++ -lxmlrpc++ -Lblddir/src -lxmlrpc |
74 |
+ -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -Lblddir/src -lxmlrpc |
75 |
|
76 |
LIBXMLRPC_SERVER_PSTREAMPP_SH = $(call shlibfn, libxmlrpc_server_pstream++) |
77 |
|
78 |
$(LIBXMLRPC_SERVER_PSTREAMPP_SH): $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) \ |
79 |
$(LIBXMLRPC_SERVER) \ |
80 |
- $(call shliblefn, libxmlrpc_packetsocket) |
81 |
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ |
82 |
+ $(call shliblefn, libxmlrpc_packetsocket) \ |
83 |
+ $(call shliblefn, libxmlrpc_server++) |
84 |
$(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) |
85 |
$(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \ |
86 |
- -Lblddir/src -lxmlrpc_server -L. -lxmlrpc_packetsocket |
87 |
+ -Lblddir/src -lxmlrpc_server -L. -lxmlrpc_packetsocket -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) |
88 |
|
89 |
LIBXMLRPC_CLIENTPP_SH = $(call shlibfn, libxmlrpc_client++) |
90 |
|
91 |
$(LIBXMLRPC_CLIENTPP_SH): $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) \ |
92 |
+ $(LIBXMLRPC_UTIL) \ |
93 |
+ $(call shliblefn, libxmlrpc_packetsocket) \ |
94 |
$(call shliblefn, libxmlrpc++) \ |
95 |
+ $(LIBXMLRPC) \ |
96 |
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ |
97 |
$(LIBXMLRPC_CLIENT) |
98 |
$(LIBXMLRPC_CLIENTPP_SH): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) |
99 |
$(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \ |
100 |
- -L. -l$(LIBXMLRPCPP_NAME) -Lblddir/src -lxmlrpc_client |
101 |
+ -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket -Lblddir/src -lxmlrpc_client -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util |
102 |
|
103 |
LIBXMLRPC_PACKETSOCKET_SH = $(call shlibfn, libxmlrpc_packetsocket) |
104 |
|
105 |
-$(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) |
106 |
+$(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) \ |
107 |
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) |
108 |
$(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) |
109 |
+$(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = -L. -l$(LIBXMLRPCPP_NAME) |
110 |
|
111 |
libxmlrpc_cpp.a: XmlRpcCpp.o |
112 |
libxmlrpc_cpp.a: LIBOBJECTS = XmlRpcCpp.o |
113 |
|
114 |
lib$(LIBXMLRPCPP_NAME).a: $(LIBXMLRPCPP_MODS:%=%.o) |