standardize uclibc++ package

SVN-Revision: 1435

diff --git a/openwrt/package/uclibc++/Makefile b/openwrt/package/uclibc++/Makefile
index 0806a0fc471ef8e984d1f60e738787c801118211..32587c34be0b4a3ddefc0e367980d7747a79cdd6 100644 (file)
--- a/openwrt/package/uclibc++/Makefile
+++ b/openwrt/package/uclibc++/Makefile
@@ -12,10 +12,11 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tbz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_LIBCXX:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBCXX:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_LIBCXX:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,UCLIBCXX,uclibc++,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/i.86/i386/' \
@@ -31,47 +32,22 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/cris.*/cris/' \
 )
 
-
-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
-
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.config: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        cp ./uclibc++.config $(PKG_BUILD_DIR)/.config
        $(SED) 's,^.*TARGET_ARCH.*,TARGET_ARCH="$(UCLIBC_TARGET_ARCH)",g' $(PKG_BUILD_DIR)/.config
        $(SED) 's,^.*ARCH_CFLAGS.*,ARCH_CFLAGS="-mno-split-addresses $(TARGET_CFLAGS)",g' $(PKG_BUILD_DIR)/.config
-       
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.config
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)"
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
-$(STAGING_DIR)/lib/libuClibc++.so: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(STAGING_DIR)" \
-               install
-
-$(IPKG_LIBCXX): $(STAGING_DIR)/lib/libuClibc++.so
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBCXX) ./$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(IDIR_LIBCXX)/usr/lib
-       cp -fpR $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_LIBCXX)/usr/lib/
-       $(STRIP) $(IDIR_LIBCXX)/usr/lib/*.so*
+               $(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+       touch $@
+
+$(IPKG_UCLIBCXX):
+       install -d -m0755 $(IDIR_UCLIBCXX)/usr/lib
+       cp -fpR $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/
+       $(STRIP) $(IDIR_UCLIBCXX)/usr/lib/*.so*
        mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(IDIR_LIBCXX) $(PACKAGE_DIR)
-
-$(INFO_LIBCXX): $(IPKG_LIBCXX)
-       $(IPKG) install $(IPKG_LIBCXX)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBCXX)
-install: $(INFO_LIBCXX)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBCXX)
-       rm -f $(STAGING_DIR)/lib/libuClibc++.so* 
+       $(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR)

diff --git a/openwrt/package/uclibc++/ipkg/uclibc++.control b/openwrt/package/uclibc++/ipkg/uclibc++.control
new file mode 100644 (file)
index 0000000..2e37df8
--- /dev/null
+++ b/openwrt/package/uclibc++/ipkg/uclibc++.control
@@ -0,0 +1,6 @@
+Package: uclibc++
+Priority: optional
+Section: libs
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: A standard c++ library for embedded systems

diff --git a/openwrt/package/uclibc++/uClibc++.control b/openwrt/package/uclibc++/uClibc++.control
deleted file mode 100644 (file)
index 2e37df8..0000000
--- a/openwrt/package/uclibc++/uClibc++.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: uclibc++
-Priority: optional
-Section: libs
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: A standard c++ library for embedded systems