hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix libraries packaging for uml on x86_64 

SVN-Revision: 11970
lede-17.01
Nicolas Thill 2008-07-28 14:19:02 +00:00
parent 5ca686b513
commit a5df818e0d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/base-files/Makefile
View File

@ -22,6 +22,9 @@ ifneq ($(DUMP),1)
TARGET:=$(TARGET)-$(PROFILE) TARGET:=$(TARGET)-$(PROFILE)
endif endif
LIBGCC_VERSION:=$(GCC_VERSION) LIBGCC_VERSION:=$(GCC_VERSION)
ifeq ($(ARCH),x86_64)
LIB_SUFFIX:=64
endif
else else
UCLIBC_VERSION:=<UCLIBC_VERSION> UCLIBC_VERSION:=<UCLIBC_VERSION>
LIBGCC_VERSION:=<LIBGCC_VERSION> LIBGCC_VERSION:=<LIBGCC_VERSION>
@ -173,19 +176,19 @@ endef
define Package/libgcc/install define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib $(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 endef
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4) ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
define Package/libssp/install define Package/libssp/install
$(INSTALL_DIR) $(1)/lib $(INSTALL_DIR) $(1)/lib
$(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
endef endef
endif endif
define Package/libstdcpp/install define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/lib $(INSTALL_DIR) $(1)/lib
$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/
endef endef
define Package/libpthread/install define Package/libpthread/install
@ -196,7 +199,7 @@ endef
define Package/uclibc/install define Package/uclibc/install
$(INSTALL_DIR) $(1)/lib $(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.so.* $(1)/lib/; \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
done done