EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

toolchain: Force installation into /lib

Browse Source 
For 64-bit capable systems, a symbolic link is set up for /lib64 to point to
/lib, so make sure the installation goes into /lib, irrespective of where the C
library files come from in an external toolchain.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2016-09-21 17:32:10 -07:00 committed by Felix Fietkau
parent 96b59dc383
commit 493b0f3f57
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/libs/toolchain/Makefile
View File

@ -484,71 +484,63 @@ else
define Package/libgcc/install define Package/libgcc/install
for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/libgfortran/install define Package/libgfortran/install
for file in $(call qstrip,$(CONFIG_LIBGFORTRAN_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBGFORTRAN_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done done
endef endef
define Package/libssp/install define Package/libssp/install
for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/libstdcpp/install define Package/libstdcpp/install
for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/libc/install define Package/libc/install
for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/libpthread/install define Package/libpthread/install
for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/librt/install define Package/librt/install
for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef
define Package/libatomic/install define Package/libatomic/install
for file in $(call qstrip,$(CONFIG_LIBATOMIC_FILE_SPEC)); do \ for file in $(call qstrip,$(CONFIG_LIBATOMIC_FILE_SPEC)); do \
dir=`dirname $$$$file` ; \ $(INSTALL_DIR) $(1)/lib ; \
$(INSTALL_DIR) $(1)/$$$$dir ; \ $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/lib/ ; \
$(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
done ; \ done ; \
exit 0 exit 0
endef endef