aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/Makefile
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-04-24 02:07:24 +0000
committerNicolas Thill <nico@openwrt.org>2009-04-24 02:07:24 +0000
commitda31c0be0729db475d9d4dd38e324e54d8a1a45e (patch)
tree9d6f7295056441b2f0941d9807b9d01c92c9dad9 /package/base-files/Makefile
parent0874c6efcf03eff49743a3888709cf60bd44278a (diff)
downloadupstream-da31c0be0729db475d9d4dd38e324e54d8a1a45e.tar.gz
upstream-da31c0be0729db475d9d4dd38e324e54d8a1a45e.tar.bz2
upstream-da31c0be0729db475d9d4dd38e324e54d8a1a45e.zip
[toolchain] uClibc cleanup:
- use full version string (0.9.30.1), instead of base (0.9.30) + extra (.1) - remove support for 0.9.28 and snapshots (building from SVN to be added later) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15368 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/Makefile')
-rw-r--r--package/base-files/Makefile14
1 files changed, 5 insertions, 9 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 440562b877..050f0f9efe 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -29,10 +29,6 @@ else
LIBGCC_VERSION:=<LIBGCC_VERSION>
endif
-ifneq ($(LIBC_VERSION),0.9.28)
- LIBC_VERSION:=$(LIBC_VERSION)$(LIBC_PATCHVER)
-endif
-
CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
define Package/base-files$(TARGET)
@@ -216,10 +212,10 @@ use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),lib
define Package/glibc/install
$(INSTALL_DIR) $(1)/lib
$(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
- $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).so $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so $(1)/lib/
for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
- $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+ $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
done
endef
@@ -231,7 +227,7 @@ define Package/uClibc/install
$(INSTALL_DIR) $(1)/lib
for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
- $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+ $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
done
endef
@@ -242,13 +238,13 @@ endef
define Package/libpthread/install
$(INSTALL_DIR) $(1)/lib
$(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
- $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_VERSION).so $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/
endef
define Package/librt/install
$(INSTALL_DIR) $(1)/lib
$(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/
- $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_VERSION).so $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/
endef
define Package/ldd/install