The original Makefile installed libtool wrapper scripts instead of the
real binaries. Increase PKG_RELEASE to trigger rebuild.
Signed-off-by: John Lee <john.cy...@gmail.com>
---
libs/libupnp/Makefile | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index 83bdb5e..904540d 100644
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libupnp
PKG_VERSION:=1.6.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pupnp
@@ -50,33 +50,6 @@ define Package/libupnp-sample/description
TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
endef
-define Build/Configure
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-static \
- );
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile/libupnp-sample
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- check
- $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- upnp_tv_device upnp_tv_ctrlpt
-endef
-
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*,la}
$(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc
$(1)/usr/lib/pkgconfig/
-endef
-
define Package/libupnp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.*
$(1)/usr/lib/
@@ -84,10 +57,9 @@ endef
define Package/libupnp-sample/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
$(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
- $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/*
$(1)/etc/upnp-tvdevice
endef
$(eval $(call BuildPackage,libupnp))
--
1.7.4.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
