Changeset 11970


Ignore:
Timestamp:
2008-07-28T16:19:02+02:00 (10 years ago)
Author:
nico
Message:

fix libraries packaging for uml on x86_64

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r11445 r11970  
    2323  endif 
    2424  LIBGCC_VERSION:=$(GCC_VERSION) 
     25  ifeq ($(ARCH),x86_64) 
     26    LIB_SUFFIX:=64 
     27  endif 
    2528else 
    2629  UCLIBC_VERSION:=<UCLIBC_VERSION> 
     
    174177define Package/libgcc/install 
    175178        $(INSTALL_DIR) $(1)/lib 
    176         $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ 
     179        $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/ 
    177180endef 
    178181 
     
    180183  define Package/libssp/install 
    181184        $(INSTALL_DIR) $(1)/lib 
    182         $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ 
     185        $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ 
    183186  endef 
    184187endif 
     
    186189define Package/libstdcpp/install 
    187190        $(INSTALL_DIR) $(1)/lib 
    188         $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/ 
     191        $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/ 
    189192endef 
    190193 
     
    197200define Package/uclibc/install 
    198201        $(INSTALL_DIR) $(1)/lib 
    199         for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ 
     202        for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ 
    200203                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ 
    201204                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ 
Note: See TracChangeset for help on using the changeset viewer.