X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/11543233b23052270bdda2cb21cc41096e579904..fd7d7215c62c223031426b1b84e96cd4186bd148:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 577d320b2..1c6cc0578 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) -PKG_FILE_DEPEND:=$(PLATFORM_DIR) +PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) ifeq ($(REV),) @@ -72,6 +72,7 @@ endef define Package/libgcc $(call Package/gcc/Default) TITLE:=GCC support library + DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN endef define Package/libssp @@ -79,6 +80,13 @@ define Package/libssp TITLE:=GCC support library endef +define Package/libstdcpp + $(call Package/gcc/Default) + NAME:=libstdc++ + TITLE:=GNU Standard C++ Library v3 + DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP +endef + define Package/uclibc/Default SECTION:=libs CATEGORY:=Base system @@ -110,6 +118,9 @@ endef define Package/base-files$(TARGET)/install $(CP) ./files/* $(1)/ + if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ + fi if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \ $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \ fi @@ -119,11 +130,11 @@ define Package/base-files$(TARGET)/install fi; \ fi $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf + $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs mkdir -p $(1)/jffs - mkdir -p $(1)/lib + mkdir -p $(1)/lib/firmware mkdir -p $(1)/mnt mkdir -p $(1)/proc mkdir -p $(1)/tmp @@ -157,6 +168,11 @@ ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4) endef endif +define Package/libstdcpp/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(STAGING_DIR)/lib/libstdc++.so.* $(1)/lib/ +endef + define Package/libpthread/install $(INSTALL_DIR) $(1)/lib $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/ @@ -188,5 +204,6 @@ endif $(eval $(call BuildPackage,base-files$(TARGET))) $(eval $(call BuildPackage,libgcc)) $(eval $(call BuildPackage,libssp)) +$(eval $(call BuildPackage,libstdcpp)) $(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,uclibc))