mirror of
https://github.com/openwrt/packages.git
synced 2025-07-06 21:00:44 +00:00
920feb7093
Remove xmlrpc-c Package definition and let both xmlrpc-c-internal and xmlrpc-c-libxml2 provide xmlrpc-c. Also add a patch removing the unnecessary linking. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -183,7 +183,7 @@ $(LIBXMLRPC_SERVER): \
|
|
$(call shliblefn, libxmlrpc)
|
|
$(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
|
|
$(LIBXMLRPC_SERVER): LIBDEP = \
|
|
- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
|
|
+ -L. -lxmlrpc $(LIBXMLRPC_UTIL_LIBDEP)
|
|
|
|
LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
|
|
|
|
@@ -197,7 +197,7 @@ $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS =
|
|
$(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
|
|
-L. -lxmlrpc_server \
|
|
-L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
|
|
- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
|
|
+ -L. -lxmlrpc $(LIBXMLRPC_UTIL_LIBDEP)
|
|
ifeq ($(MSVCRT),yes)
|
|
$(LIBXMLRPC_SERVER_ABYSS): LIBDEP += -lws2_32 -lwsock32
|
|
endif
|
|
@@ -212,7 +212,7 @@ $(LIBXMLRPC_SERVER_CGI): \
|
|
$(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
|
|
$(LIBXMLRPC_SERVER_CGI): LIBDEP = \
|
|
-L. -lxmlrpc_server \
|
|
- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
|
|
+ -L. -lxmlrpc $(LIBXMLRPC_UTIL_LIBDEP)
|
|
|
|
LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
|
|
|
|
@@ -237,7 +237,6 @@ $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
|
|
LIBXMLRPC_CLIENT_LIBDEP = \
|
|
-Lblddir/src -Lblddir/lib/libutil \
|
|
-lxmlrpc -lxmlrpc_util \
|
|
- $(XML_PARSER_LIBDEP) \
|
|
$(TRANSPORT_LIBDEP) \
|
|
|
|
$(LIBXMLRPC_CLIENT): LIBDEP = \
|