bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] xmlrpc-c: update to 2233, remove unrecognized configure option, cleanup Makefile

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29845 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-01-22 05:37:00 +00:00
parent e8188cac6c
commit bb36a7ae69
1 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
libs/xmlrpc-c/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2010 OpenWrt.org # Copyright (C) 2007-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xmlrpc-c PKG_NAME:=xmlrpc-c
PKG_REV:=2080 PKG_REV:=2233
PKG_VERSION:=advanced_r$(PKG_REV) PKG_VERSION:=advanced_r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -26,70 +26,60 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/xmlrpc-c-common define Package/xmlrpc-c/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=XML-RPC library - common TITLE:=XML-RPC library
URL:=http://xmlrpc-c.sourceforge.net/ URL:=http://xmlrpc-c.sourceforge.net/
endef endef
define Package/xmlrpc-c-common
$(call Package/xmlrpc-c/Default)
TITLE+= - common
endef
define Package/xmlrpc-c-internal define Package/xmlrpc-c-internal
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - (uses internal expat variant)
TITLE:=XML-RPC library - (ueses internal expat variant)
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c-common DEPENDS:=+xmlrpc-c-common
# PROVIDES:=xmlrpc-c # PROVIDES:=xmlrpc-c
VARIANT:=internal VARIANT:=internal
endef endef
define Package/xmlrpc-c define Package/xmlrpc-c
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries
TITLE:=XML-RPC library
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c-internal DEPENDS:=+xmlrpc-c-internal
endef endef
define Package/xmlrpc-c-libxml2 define Package/xmlrpc-c-libxml2
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - (uses libxml2)
TITLE:=XML-RPC library - (uses libxml2)
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN
# PROVIDES:=xmlrpc-c # PROVIDES:=xmlrpc-c
VARIANT:=libxml2 VARIANT:=libxml2
endef endef
define Package/xmlrpc-c-client define Package/xmlrpc-c-client
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - client
TITLE:=XML-RPC library - client
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c +libcurl DEPENDS:=+xmlrpc-c +libcurl
endef endef
define Package/xmlrpc-c-server define Package/xmlrpc-c-server
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - server
TITLE:=XML-RPC library - server
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c DEPENDS:=+xmlrpc-c
endef endef
define Package/xmlrpc-c-abyss define Package/xmlrpc-c-abyss
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - abyss
TITLE:=XML-RPC library - abyss
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c-common DEPENDS:=+xmlrpc-c-common
endef endef
define Package/xmlrpc-c-server-abyss define Package/xmlrpc-c-server-abyss
SECTION:=libs $(call Package/xmlrpc-c/Default)
CATEGORY:=Libraries TITLE+= - abyss server
TITLE:=XML-RPC library - abyss server
URL:=http://xmlrpc-c.sourceforge.net/
DEPENDS:=+xmlrpc-c-server +xmlrpc-c-abyss DEPENDS:=+xmlrpc-c-server +xmlrpc-c-abyss
endef endef
@ -111,7 +101,6 @@ CONFIGURE_ARGS+= \
--disable-libwww-client \ --disable-libwww-client \
--enable-abyss-server \ --enable-abyss-server \
--disable-cplusplus \ --disable-cplusplus \
--disable-static \
--disable-abyss-threads \ --disable-abyss-threads \
--disable-cgi-server --disable-cgi-server
@ -136,23 +125,18 @@ define Build/InstallDev
$(1)/usr/lib \ $(1)/usr/lib \
$(1)/usr/bin \ $(1)/usr/bin \
$(2)/bin $(2)/bin
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/* \ $(PKG_INSTALL_DIR)/usr/include/* \
$(1)/usr/include/ $(1)/usr/include/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc*.{a,so*} \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc*.{a,so*} \
$(1)/usr/lib/ $(1)/usr/lib/
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/xmlrpc-c-config \ $(PKG_INSTALL_DIR)/usr/bin/xmlrpc-c-config \
$(2)/bin/ $(2)/bin/
$(SED) \ $(SED) \
's,HEADERINST_DIR="/usr/include",HEADERINST_DIR="$(STAGING_DIR)/usr/include",g' \ 's,HEADERINST_DIR="/usr/include",HEADERINST_DIR="$(STAGING_DIR)/usr/include",g' \
$(2)/bin/xmlrpc-c-config $(2)/bin/xmlrpc-c-config
$(SED) \ $(SED) \
's,LIBINST_DIR="/usr/lib",LIBINST_DIR="$(STAGING_DIR)/usr/lib",g' \ 's,LIBINST_DIR="/usr/lib",LIBINST_DIR="$(STAGING_DIR)/usr/lib",g' \
$(2)/bin/xmlrpc-c-config $(2)/bin/xmlrpc-c-config
@ -161,7 +145,6 @@ endef
define Package/xmlrpc-c-libxml2/install define Package/xmlrpc-c-libxml2/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -170,15 +153,12 @@ endef
define Package/xmlrpc-c-internal/install define Package/xmlrpc-c-internal/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmltok.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmltok.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmlparse.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmlparse.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -187,7 +167,6 @@ endef
define Package/xmlrpc-c-server/install define Package/xmlrpc-c-server/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -196,7 +175,6 @@ endef
define Package/xmlrpc-c-abyss/install define Package/xmlrpc-c-abyss/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_abyss.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_abyss.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -205,7 +183,6 @@ endef
define Package/xmlrpc-c-server-abyss/install define Package/xmlrpc-c-server-abyss/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server_abyss.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server_abyss.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -214,7 +191,6 @@ endef
define Package/xmlrpc-c-client/install define Package/xmlrpc-c-client/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_client* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_client* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -223,7 +199,6 @@ endef
define Package/xmlrpc-c-common/install define Package/xmlrpc-c-common/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_util.so* \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_util.so* \
$(1)/usr/lib/ $(1)/usr/lib/
@ -233,7 +208,6 @@ define Package/xmlrpc-c/install
true true
endef endef
$(eval $(call BuildPackage,xmlrpc-c)) $(eval $(call BuildPackage,xmlrpc-c))
$(eval $(call BuildPackage,xmlrpc-c-common)) $(eval $(call BuildPackage,xmlrpc-c-common))
$(eval $(call BuildPackage,xmlrpc-c-libxml2)) $(eval $(call BuildPackage,xmlrpc-c-libxml2))