change cp to $(CP)

[openwrt.git] / package / uclibc++ / Makefile

diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 6cc0ceb..bb08547 100644 (file)
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uClibc++
-PKG_VERSION:=0.1.9
+PKG_VERSION:=0.1.11
 PKG_RELEASE:=1
-PKG_MD5SUM:=ebf58e04d72eab5c131c2c9118737024
+PKG_MD5SUM:=8a8e0ee8fefef150c08a649fd7da04aa
 
 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tbz2
@@ -13,9 +13,9 @@ PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-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 +31,32 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/cris.*/cris/' \
 )
 
+$(PKG_BUILD_DIR)/.configured:
+       $(CP) ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config
+       touch $@
 
-$(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
-       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
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS)
-       touch $(PKG_BUILD_DIR)/.built
+               TOPDIR="$(PKG_BUILD_DIR)/" \
+               $(TARGET_CONFIGURE_OPTS) \
+               ARCH_CFLAGS="$(TARGET_CFLAGS)" \
+               CROSS="$(TARGET_CROSS)" \
+               all
+       touch $@
+
+$(IPKG_UCLIBCXX):
+       install -d -m0755 $(IDIR_UCLIBCXX)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/
+       $(STRIP) $(IDIR_UCLIBCXX)/usr/lib/*.so*
+       mkdir -p $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/lib/libuClibc++.so: $(PKG_BUILD_DIR)/.built
+compile-targets: install-dev
+install-dev: $(PKG_BUILD_DIR)/.built
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               TOPDIR="$(PKG_BUILD_DIR)/" \
+               $(TARGET_CONFIGURE_OPTS) \
+               ARCH_CFLAGS="$(TARGET_CFLAGS)" \
+               CROSS="$(TARGET_CROSS)" \
                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 $(STAGING_DIR)/lib/libuClibc++.so* $(IDIR_LIBCXX)/usr/lib/
-       $(STRIP) $(IDIR_LIBCXX)/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*