diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-07 11:57:20 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-07 11:57:20 +0000 |
commit | 725611a466f2edf12f809d22339b22223af4afe7 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /openwrt/package/libupnp | |
parent | f4dd5a6d7c4ebea48cd6292744cb9def6037de80 (diff) |
move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@4944 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/libupnp')
-rw-r--r-- | openwrt/package/libupnp/Config.in | 13 | ||||
-rw-r--r-- | openwrt/package/libupnp/Makefile | 58 | ||||
-rw-r--r-- | openwrt/package/libupnp/ipkg/libupnp.control | 5 | ||||
-rw-r--r-- | openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch | 17 | ||||
-rw-r--r-- | openwrt/package/libupnp/patches/opt-flags.patch | 315 |
5 files changed, 0 insertions, 408 deletions
diff --git a/openwrt/package/libupnp/Config.in b/openwrt/package/libupnp/Config.in deleted file mode 100644 index bbe822efe..000000000 --- a/openwrt/package/libupnp/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUPNP - prompt "libupnp........................... Universal Plug and Play (UPnP) SDK library" - tristate - default m if CONFIG_DEVEL - help - The Universal Plug and Play (UPnP) SDK for Linux provides support - for building UPnP-compliant control points, devices, and bridges - on Linux. - - http://upnp.sourceforge.net/ - - Depends: libpthread - diff --git a/openwrt/package/libupnp/Makefile b/openwrt/package/libupnp/Makefile deleted file mode 100644 index 6e862722e..000000000 --- a/openwrt/package/libupnp/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libupnp -PKG_VERSION:=1.2.1a -PKG_RELEASE:=1 -PKG_MD5SUM:=e72b3550bf064eedf080f16f09688891 - -PKG_SOURCE_URL:=@SF/upnp -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,LIBUPNP,libupnp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR)/upnp \ - $(TARGET_CONFIGURE_OPTS) \ - OPT_FLAGS="$(TARGET_CFLAGS)" \ - STRIP=/bin/true - touch $@ - -$(IPKG_LIBUPNP): - install -m0755 -d $(IDIR_LIBUPNP)/usr/lib - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - $(RSTRIP) $(IDIR_LIBUPNP) - $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR) - -$(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built - mkdir -p $(STAGING_DIR)/usr/include/upnp - $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \ - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \ - $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \ - touch $@ - -install-dev: $(STAGING_DIR)/usr/lib/libupnp.so - -uninstall-dev: - rm -rf \ - $(STAGING_DIR)/usr/include/upnp \ - $(STAGING_DIR)/usr/lib/libixml.so \ - $(STAGING_DIR)/usr/lib/libthreadutil.so \ - $(STAGING_DIR)/usr/lib/libupnp.so \ - -compile-targets: install-dev -clean-targets: uninstall-dev diff --git a/openwrt/package/libupnp/ipkg/libupnp.control b/openwrt/package/libupnp/ipkg/libupnp.control deleted file mode 100644 index 2ebe4f7a8..000000000 --- a/openwrt/package/libupnp/ipkg/libupnp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libupnp -Priority: optional -Section: libs -Depends: libpthread -Description: The Universal Plug and Play (UPnP) SDK library. diff --git a/openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch b/openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch deleted file mode 100644 index 2ea3f8805..000000000 --- a/openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libupnp-1.2.1a/ixml/src/element.c -=================================================================== ---- libupnp-1.2.1a.orig/ixml/src/element.c -+++ libupnp-1.2.1a/ixml/src/element.c -@@ -454,9 +454,9 @@ ixmlElement_removeAttributeNode( IN IXML - element->n.firstAttr = nextSib; - } - -- ( IXML_Attr * ) attrNode->parentNode = NULL; -- ( IXML_Attr * ) attrNode->prevSibling = NULL; -- ( IXML_Attr * ) attrNode->nextSibling = NULL; -+ attrNode->parentNode = NULL; -+ attrNode->prevSibling = NULL; -+ attrNode->nextSibling = NULL; - *rtAttr = ( IXML_Attr * ) attrNode; - return IXML_SUCCESS; - diff --git a/openwrt/package/libupnp/patches/opt-flags.patch b/openwrt/package/libupnp/patches/opt-flags.patch deleted file mode 100644 index c6a8ce599..000000000 --- a/openwrt/package/libupnp/patches/opt-flags.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff -ruN libupnp-1.2.1-orig/ixml/src/Makefile libupnp-1.2.1-1/ixml/src/Makefile ---- libupnp-1.2.1-orig/ixml/src/Makefile 2003-01-14 23:06:12.000000000 +0100 -+++ libupnp-1.2.1-1/ixml/src/Makefile 2005-05-15 19:32:46.000000000 +0200 -@@ -47,6 +47,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE), 1) - CC = insure - endif -@@ -71,7 +73,7 @@ - ifeq ($(DEBUG),1) - DEBUG_FLAGS = -O -g -DDEBUG - else -- DEBUG_FLAGS = -Os -DNDEBUG -+ DEBUG_FLAGS = $(OPT_FLAGS) -DNDEBUG - STRIPU = $(STRIP) $(OBJ_DIR)/$(TARGET_OUTPUT) - endif - -diff -ruN libupnp-1.2.1-orig/threadutil/src/Makefile libupnp-1.2.1-1/threadutil/src/Makefile ---- libupnp-1.2.1-orig/threadutil/src/Makefile 2003-01-14 23:06:12.000000000 +0100 -+++ libupnp-1.2.1-1/threadutil/src/Makefile 2005-05-15 19:32:33.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - DEPDIR = .deps - df = $(DEPDIR)/$(*F) - -@@ -74,7 +76,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - CLEAN_PATH=debug/$(DIR_PATH) - else --DEBUG_FLAGS += -Os -DNO_DEBUG -DNDEBUG -+DEBUG_FLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - LOCALDIR +=../bin/$(DIR_PATH) - TARGET_OUTPUT = libthreadutil.so - OBJ_DIR = obj/$(DIR_PATH) -diff -ruN libupnp-1.2.1-orig/upnp/src/api/makefile libupnp-1.2.1-1/upnp/src/api/makefile ---- libupnp-1.2.1-orig/upnp/src/api/makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/api/makefile 2005-05-15 19:33:04.000000000 +0200 -@@ -43,6 +43,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE), 1) - CC = insure - endif -@@ -64,7 +66,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = ../lib/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = ../lib/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/gena/Makefile libupnp-1.2.1-1/upnp/src/gena/Makefile ---- libupnp-1.2.1-orig/upnp/src/gena/Makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/gena/Makefile 2005-05-15 19:33:32.000000000 +0200 -@@ -43,6 +43,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC=insure - endif -@@ -60,7 +62,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/client_table/Makefile libupnp-1.2.1-1/upnp/src/genlib/client_table/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/client_table/Makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/client_table/Makefile 2005-05-15 19:33:41.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC=insure - endif -@@ -73,7 +75,7 @@ - else - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = ../../lib/$(DIR_PATH) --CFLAGS += -Os -D_REENTRANT -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -D_REENTRANT -DNO_DEBUG -DNDEBUG - endif - - TARGET_OUTPUT = $(UPNP_LIB_DIR)client_table.o -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/miniserver/Makefile libupnp-1.2.1-1/upnp/src/genlib/miniserver/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/miniserver/Makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/miniserver/Makefile 2005-05-15 19:33:56.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC=insure - endif -@@ -60,7 +62,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = ../../lib/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = ../../lib/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/Makefile libupnp-1.2.1-1/upnp/src/genlib/net/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/net/Makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/net/Makefile 2005-05-15 19:34:07.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - LIBS=../../lib - UPNP_INC_DIR = -I../../inc -I../../../inc -I ../../../../threadutil/src/win32 \ - -I ../../../../threadutil/src -I ../../../../ixml/inc -@@ -59,7 +61,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/http/Makefile libupnp-1.2.1-1/upnp/src/genlib/net/http/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/net/http/Makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/net/http/Makefile 2005-05-15 19:34:18.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - UPNP_INC_DIR = -I ../../../../inc -I ../../../inc \ - -I ../../../../../threadutil/src/win32 \ - -I ../../../../../threadutil/src -I ../../../../../ixml/inc -@@ -57,7 +59,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/uri/makefile libupnp-1.2.1-1/upnp/src/genlib/net/uri/makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/net/uri/makefile 2003-01-14 23:06:13.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/net/uri/makefile 2005-05-15 19:35:22.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - LIBS = ../../../lib - - -@@ -59,7 +61,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/service_table/Makefile libupnp-1.2.1-1/upnp/src/genlib/service_table/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/service_table/Makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/service_table/Makefile 2005-05-15 19:35:33.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC=insure - endif -@@ -61,7 +63,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/util/Makefile libupnp-1.2.1-1/upnp/src/genlib/util/Makefile ---- libupnp-1.2.1-orig/upnp/src/genlib/util/Makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/genlib/util/Makefile 2005-05-15 19:35:44.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC=insure - endif -@@ -62,7 +64,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/soap/makefile libupnp-1.2.1-1/upnp/src/soap/makefile ---- libupnp-1.2.1-orig/upnp/src/soap/makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/soap/makefile 2005-05-15 19:35:55.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC = insure - endif -@@ -61,7 +63,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/ssdp/makefile libupnp-1.2.1-1/upnp/src/ssdp/makefile ---- libupnp-1.2.1-orig/upnp/src/ssdp/makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/ssdp/makefile 2005-05-15 19:36:04.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC = insure - endif -@@ -61,7 +63,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/urlconfig/Makefile libupnp-1.2.1-1/upnp/src/urlconfig/Makefile ---- libupnp-1.2.1-orig/upnp/src/urlconfig/Makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/urlconfig/Makefile 2005-05-15 19:36:30.000000000 +0200 -@@ -43,6 +43,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC = insure - endif -@@ -60,7 +62,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif -diff -ruN libupnp-1.2.1-orig/upnp/src/uuid/Makefile libupnp-1.2.1-1/upnp/src/uuid/Makefile ---- libupnp-1.2.1-orig/upnp/src/uuid/Makefile 2003-01-14 23:06:14.000000000 +0100 -+++ libupnp-1.2.1-1/upnp/src/uuid/Makefile 2005-05-15 19:36:53.000000000 +0200 -@@ -44,6 +44,8 @@ - STRIP = strip - endif - -+OPT_FLAGS = -Os -+ - ifeq ($(INSURE),1) - CC = insure - endif -@@ -61,7 +63,7 @@ - OBJ_DIR = obj/debug/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH) - else --CFLAGS += -Os -DNO_DEBUG -DNDEBUG -+CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG - OBJ_DIR = obj/$(DIR_PATH) - UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH) - endif |