diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2023-11-30 08:49:19 +0100 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2023-12-01 11:19:39 -0800 |
| commit | 920feb70933add258ec385ec9bb934b76bea49b9 (patch) | |
| tree | a4844982bfbac678dfcf7628abd856df2625ba76 /libs/xmlrpc-c | |
| parent | f0cf2e75c3b4c5710a9f12426bd7284d3cdf624e (diff) | |
libs/xmlrpc-c: restore support for xmlrpc-c-libxml2 package
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>
Diffstat (limited to 'libs/xmlrpc-c')
| -rw-r--r-- | libs/xmlrpc-c/Makefile | 22 | ||||
| -rw-r--r-- | libs/xmlrpc-c/patches/002-remove-unnecessary-linking.patch | 37 |
2 files changed, 42 insertions, 17 deletions
diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile index 13e77fc7e..0ea2071d5 100644 --- a/libs/xmlrpc-c/Makefile +++ b/libs/xmlrpc-c/Makefile @@ -42,22 +42,15 @@ define Package/xmlrpc-c-internal $(call Package/xmlrpc-c/Default) TITLE+= (uses internal expat variant) DEPENDS:=+xmlrpc-c-common -# PROVIDES:=xmlrpc-c + PROVIDES:=xmlrpc-c VARIANT:=internal - HIDDEN:=1 -endef - -define Package/xmlrpc-c - $(call Package/xmlrpc-c/Default) - TITLE+= (uses internal expat variant) - DEPENDS:=+xmlrpc-c-internal endef define Package/xmlrpc-c-libxml2 $(call Package/xmlrpc-c/Default) TITLE+= (uses libxml2) - DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN -# PROVIDES:=xmlrpc-c + DEPENDS:=+xmlrpc-c-common +libxml2 + PROVIDES:=xmlrpc-c VARIANT:=libxml2 endef @@ -117,7 +110,7 @@ ifeq ($(BUILD_VARIANT),internal) endif define Build/Compile - ( cd $(PKG_BUILD_DIR)/lib/expat/gennmtab && cc -I$(PKG_BUILD_DIR) -c gennmtab.c -o gennmtab.o && cc -o gennmtab gennmtab.o ) + ( cd $(PKG_BUILD_DIR)/lib/expat/gennmtab && cc -I$(PKG_BUILD_DIR) -c gennmtab.c -o gennmtab.o && cc -o gennmtab gennmtab.o ) $(call Build/Compile/Default) endef @@ -207,13 +200,8 @@ define Package/xmlrpc-c-common/install $(1)/usr/lib/ endef -define Package/xmlrpc-c/install - true -endef - -$(eval $(call BuildPackage,xmlrpc-c)) $(eval $(call BuildPackage,xmlrpc-c-common)) -#$(eval $(call BuildPackage,xmlrpc-c-libxml2)) +$(eval $(call BuildPackage,xmlrpc-c-libxml2)) $(eval $(call BuildPackage,xmlrpc-c-internal)) $(eval $(call BuildPackage,xmlrpc-c-server)) $(eval $(call BuildPackage,xmlrpc-c-abyss)) diff --git a/libs/xmlrpc-c/patches/002-remove-unnecessary-linking.patch b/libs/xmlrpc-c/patches/002-remove-unnecessary-linking.patch new file mode 100644 index 000000000..0e21dcf71 --- /dev/null +++ b/libs/xmlrpc-c/patches/002-remove-unnecessary-linking.patch @@ -0,0 +1,37 @@ +--- 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 = \ |