X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fuclibc%2B%2B%2FMakefile;h=3b438fefb1e7a7d8f8a1b66a4b4eedc75bab0595;hp=0e8e96642237ea8b7fc8dd02ab73317d6c81d71c;hb=289168da7d3b3b20ca039539871483bd25a4e325;hpb=3c8d9b5e1e565d7b7edf569eaaa8d3ecff4a393c

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 0e8e966422..3b438fefb1 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -4,19 +4,19 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 3843 2006-05-30 18:55:52Z florian $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uclibc++
-PKG_VERSION:=0.2.0
+PKG_VERSION:=0.2.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION)
-PKG_SOURCE:=uClibc++-$(PKG_VERSION).tbz2
+PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
-PKG_MD5SUM:=33e01302511c9a1987fb104f12d173e1
-PKG_CAT:=bzcat
+PKG_MD5SUM:=1ceef3209cca88be8f1bd9de99735954
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,55 +25,62 @@ define Package/uclibcxx
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C++ library for embedded systems
-  DESCRIPTION:=A standard C++ library for embedded systems
   URL:=http://cxx.uclibc.org/src/
 endef
 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
-                -e 's/i.86/i386/' \
-                -e 's/sparc.*/sparc/' \
-                -e 's/m68k.*/m68k/' \
-                -e 's/ppc/powerpc/g' \
-                -e 's/v850.*/v850/g' \
-                -e 's/sh64/sh/' \
-                -e 's/sh[234].*/sh/' \
-                -e 's/mips.*/mips/' \
-                -e 's/mipsel.*/mips/' \
-                -e 's/cris.*/cris/' \
+	-e 's/i.86/i386/' \
+	-e 's/sparc.*/sparc/' \
+	-e 's/m68k.*/m68k/' \
+	-e 's/ppc/powerpc/g' \
+	-e 's/v850.*/v850/g' \
+	-e 's/sh64/sh/' \
+	-e 's/sh[234].*/sh/' \
+	-e 's/mips.*/mips/' \
+	-e 's/mipsel.*/mips/' \
+	-e 's/cris.*/cris/' \
 )
 
+MAKE_FLAGS:= \
+	TOPDIR="$(PKG_BUILD_DIR)/" \
+	$(TARGET_CONFIGURE_OPTS) \
+	ARCH_CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS="$(TARGET_CROSS)" \
+	CP="$(CP)" \
+
 define Build/Configure
-	cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config
+	if [ -f ./files/config.$(UCLIBC_TARGET_ARCH) ]; then \
+		cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config; \
+	else \
+		cp ./files/config.default $(PKG_BUILD_DIR)/.config; \
+	fi
 endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		TOPDIR="$(PKG_BUILD_DIR)/" \
-		$(TARGET_CONFIGURE_OPTS) \
-		ARCH_CFLAGS="$(TARGET_CFLAGS)" \
-		CROSS="$(TARGET_CROSS)" \
-		all
-endef
-
-define Package/uclibcxx/install
-	install -m0755 -d $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so.* $(1)/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/libuClibc++-*.so $(1)/lib/
+		$(MAKE_FLAGS) \
+		DESTDIR="$(PKG_INSTALL_DIR)/usr" \
+		all install
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		TOPDIR="$(PKG_BUILD_DIR)/" \
-                $(TARGET_CONFIGURE_OPTS) \
-                ARCH_CFLAGS="$(TARGET_CFLAGS)" \
-                CROSS="$(TARGET_CROSS)" \
-		DESTDIR="$(STAGING_DIR)" \
-		install
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/
+	$(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
+	$(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc
+# add another wrapper which links against both uClibc++ and libstdc++ 
+	$(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std
+	$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std
+	$(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(2)/bin/g++-uc+std
+	$(SED) 's|-nostdinc++||g' $(2)/bin/g++-uc+std
 endef
-	
-define Build/UninstallDev
-	rm -rf $(STAGING_DIR)/lib/libuClibc++*.{a,so*}
+
+define Package/uclibcxx/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++-*.so $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,uclibcxx))