[packages] apr-util: update to 1.3.10 (CVE-2010-1623), use PKG_INSTALL and MAKE_FLAGS

[openwrt/svn-archive/archive.git] / libs / ustl / Makefile

diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile
index ae1a2647c2f0d411e3608258501002863c83709f..f467e9750b14d06f072bbdc0d8ecdc02db291bb8 100644 (file)
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -12,13 +11,9 @@ PKG_NAME:=ustl
 PKG_VERSION:=0.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2
 PKG_SOURCE_URL:=@SF/ustl
 PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0
-PKG_CAT:=bzcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,12 +21,16 @@ define Package/ustl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C++ STL for embedded systems
-  DESCRIPTION:=C++ Standard Template Library (STL) for embedded systems.\\\
+  DEPENDS:=@!TARGET_avr32
+  URL:=http://ustl.sourceforge.net/
+endef
+
+define Package/ustl/description
+       C++ Standard Template Library (STL) for embedded systems.\\\
     uSTL is a partial implementation of the STL (Standard Template \\\
     Library) that reduces code size by factoring memory management \\\
     code into a non-template base class and deriving containers \\\
     from it.
-  URL:=http://ustl.sourceforge.net/
 endef
 
 define Build/Configure
@@ -39,9 +38,9 @@ define Build/Configure
        $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CROSS="$(TARGET_CROSS)" \
                OPTFLAGS="$(TARGET_CFLAGS)" \
@@ -55,16 +54,10 @@ define Package/ustl/install
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/ustl* \
-               $(STAGING_DIR)/usr/lib/libustl.{a,so*}
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,ustl))