diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-04-24 02:07:24 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-04-24 02:07:24 +0000 |
| commit | 222f37cbde2e880148eecd7bee5f39bb2afa6159 (patch) | |
| tree | a6c174b24a09175c2add6a0264a5d89a7f584a50 /package | |
| parent | 2783110a97a84c52b590221b637b3596d18dc013 (diff) | |
| download | upstream-222f37cbde2e880148eecd7bee5f39bb2afa6159.tar.gz upstream-222f37cbde2e880148eecd7bee5f39bb2afa6159.tar.bz2 upstream-222f37cbde2e880148eecd7bee5f39bb2afa6159.zip | |
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)
SVN-Revision: 15368
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 14 |
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 |