summaryrefslogtreecommitdiffstats
path: root/package/uclibc++
diff options
context:
space:
mode:
Diffstat (limited to 'package/uclibc++')
-rw-r--r--package/uclibc++/Makefile57
-rw-r--r--package/uclibc++/ipkg/uclibc++.control (renamed from package/uclibc++/uClibc++.control)0
2 files changed, 19 insertions, 38 deletions
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 0806a0fc4..9e071c511 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -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,28 @@ 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
-
+ touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.config
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)"
- touch $(PKG_BUILD_DIR)/.built
+ $(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)" \
+ all
+ 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_UCLIBCXX) $(PACKAGE_DIR)
-$(STAGING_DIR)/lib/libuClibc++.so: $(PKG_BUILD_DIR)/.built
+compile: install-dev
+install-dev:
$(MAKE) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) 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 $(PKG_BUILD_DIR)/src/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*
diff --git a/package/uclibc++/uClibc++.control b/package/uclibc++/ipkg/uclibc++.control
index 2e37df899..2e37df899 100644
--- a/package/uclibc++/uClibc++.control
+++ b/package/uclibc++/ipkg/uclibc++.control