diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 09:51:34 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 09:51:34 +0000 |
commit | 7fa38c6a7bf8689dd6f574f8d38fd3faae20fb73 (patch) | |
tree | 8dc3ab8d926f95bf4e20cfa76dc4165c7b7afcb3 | |
parent | 9a7dcab25717558df58aa90425957298ef250b36 (diff) |
make gcc compile install libgcc_s by default, remove package/libgcc/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@755 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/Config.in | 1 | ||||
-rw-r--r-- | package/Makefile | 1 | ||||
-rw-r--r-- | package/libgcc/Config.in | 9 | ||||
-rw-r--r-- | package/libgcc/Makefile | 35 | ||||
-rw-r--r-- | package/libgcc/ipkg/libgcc.control | 6 | ||||
-rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 3 |
6 files changed, 3 insertions, 52 deletions
diff --git a/package/Config.in b/package/Config.in index eb396ddac..44006e943 100644 --- a/package/Config.in +++ b/package/Config.in @@ -57,7 +57,6 @@ source "package/l2tpd/Config.in" source "package/tinc/Config.in" comment "Libraries" -source "package/libgcc/Config.in" source "package/libpthread/Config.in" source "package/zlib/Config.in" source "package/uclibc++/Config.in" diff --git a/package/Makefile b/package/Makefile index 6cbadad24..6fdf92984 100644 --- a/package/Makefile +++ b/package/Makefile @@ -28,7 +28,6 @@ package-$(BR2_PACKAGE_KISMET) += kismet package-$(BR2_PACKAGE_L2TPD) += l2tpd package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux package-$(BR2_PACKAGE_LIBELF) += libelf -package-$(BR2_PACKAGE_LIBGCC) += libgcc package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread package-$(BR2_PACKAGE_LIBUSB) += libusb package-$(BR2_PACKAGE_LZO) += lzo diff --git a/package/libgcc/Config.in b/package/libgcc/Config.in deleted file mode 100644 index 074b8a311..000000000 --- a/package/libgcc/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBGCC - tristate "libgcc (GCC support library)" - default m if CONFIG_DEVEL - help - Shared version of the support library, a library of - internal subroutines that GCC uses to overcome - shortcomings of particular machines, or special needs - for some languages. - diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile deleted file mode 100644 index e1d4e8677..000000000 --- a/package/libgcc/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libgcc -PKG_VERSION:=$(BR2_GCC_VERSION) -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -IPKG_LIBGCC:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -IDIR_LIBGCC:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -INFO_LIBGCC:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list - -.NOTPARALLEL: - -$(IPKG_LIBGCC): $(STAGING_DIR)/lib/libgcc_s.so - rm -rf $(PKG_BUILD_DIR) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_LIBGCC)/lib - cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ - $(STRIP) $(IDIR_LIBGCC)/lib/lib*.so* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR) - -$(INFO_LIBGCC): $(IPKG_LIBGCC) - $(IPKG) install $(IPKG_LIBGCC) - -source: -prepare: -compile: $(IPKG_LIBGCC) -install: $(INFO_LIBGCC) - -clean: - rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBGCC) diff --git a/package/libgcc/ipkg/libgcc.control b/package/libgcc/ipkg/libgcc.control deleted file mode 100644 index 0d68fbf8c..000000000 --- a/package/libgcc/ipkg/libgcc.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libgcc -Priority: optional -Section: libs -Maintainer: Nico <nthill@free.fr> -Source: buildroot internal -Description: GCC support library diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index e719b8714..c7f949503 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -203,6 +203,9 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) cp ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif + # These are in /lib, so... + cp -a $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + $(STRIP) $(TARGET_DIR)/lib/libgcc_s.so.1 gcc: gcc_initial $(LIBFLOAT_TARGET) \ gcc-install $(GCC_TARGETS) |