aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-01 13:29:04 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-01 13:29:04 +0000
commit8933b2fa2570d6fffcea49171a416893dc350d7e (patch)
treed10c7d31f2195dbc2a90cdc942de0f4e2e80fc41 /package
parentaea73391d7ec10f93b3f246e27a354fc64f21b00 (diff)
downloadupstream-8933b2fa2570d6fffcea49171a416893dc350d7e.tar.gz
upstream-8933b2fa2570d6fffcea49171a416893dc350d7e.tar.bz2
upstream-8933b2fa2570d6fffcea49171a416893dc350d7e.zip
package/base-files: fix libraries packaging on 64bits targets (closes: #6918)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile23
1 files changed, 14 insertions, 9 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b1caac8c0a..2c9b387e53 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=42
+PKG_RELEASE:=43
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -22,10 +22,7 @@ ifneq ($(DUMP),1)
TARGET:=$(TARGET)-$(PROFILE)
endif
LIBGCC_VERSION:=$(GCC_VERSION)
- ifeq ($(ARCH),x86_64)
- LIB_SUFFIX:=64
- endif
- ifneq ($(findstring mips64,$(ARCH)),)
+ ifneq ($(findstring $(ARCH) , mips64 x86_64 ),)
LIB_SUFFIX:=64
endif
else
@@ -395,17 +392,17 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
endef
define Package/libssp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
endef
define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
+ $(CP) $(TOOLCHAIN_DIR)/usr/lib/libstdc++.so.* $(1)/usr/lib/
endef
use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
@@ -432,7 +429,15 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
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/ld*-uClibc.so.* \
+ $(TOOLCHAIN_DIR)/lib/ld*-uClibc-$(LIBC_SO_VERSION).so \
+ $(1)/lib/
+ $(CP) \
+ $(TOOLCHAIN_DIR)/lib/libc.so.* \
+ $(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \
+ $(1)/lib/
+ for file in libcrypt libdl libm libnsl libresolv libutil; do \
$(CP) \
$(TOOLCHAIN_DIR)/lib/$$$$file.so.* \
$(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \