diff options
| author | Nicolas Thill <nico@openwrt.org> | 2008-07-28 14:19:02 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2008-07-28 14:19:02 +0000 |
| commit | a5df818e0de2efed1c89f87897ddb671612a8179 (patch) | |
| tree | d4283588e7cb3cd1eb2218bc22e910673d1fa110 /package | |
| parent | 5ca686b513292738c9334cb1b15b31a6336416ff (diff) | |
| download | upstream-a5df818e0de2efed1c89f87897ddb671612a8179.tar.gz upstream-a5df818e0de2efed1c89f87897ddb671612a8179.tar.bz2 upstream-a5df818e0de2efed1c89f87897ddb671612a8179.zip | |
fix libraries packaging for uml on x86_64
SVN-Revision: 11970
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index bec33c8e05..5ab776df51 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -22,6 +22,9 @@ ifneq ($(DUMP),1) TARGET:=$(TARGET)-$(PROFILE) endif LIBGCC_VERSION:=$(GCC_VERSION) + ifeq ($(ARCH),x86_64) + LIB_SUFFIX:=64 + endif else UCLIBC_VERSION:=<UCLIBC_VERSION> LIBGCC_VERSION:=<LIBGCC_VERSION> @@ -173,19 +176,19 @@ endef define Package/libgcc/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/ endef ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4) define Package/libssp/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ endef endif define Package/libstdcpp/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/ endef define Package/libpthread/install @@ -196,7 +199,7 @@ endef define Package/uclibc/install $(INSTALL_DIR) $(1)/lib - for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ + for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ done |