From: Florian Fainelli Date: Thu, 22 Sep 2016 00:32:10 +0000 (-0700) Subject: toolchain: Force installation into /lib X-Git-Tag: v17.01.0-rc1~1340 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=493b0f3f575520b35b6b01341b28147c67e90884;p=oweals%2Fopenwrt.git toolchain: Force installation into /lib 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 --- diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 75a3f35539..0101b81a31 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -484,71 +484,63 @@ else define Package/libgcc/install for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libgfortran/install for file in $(call qstrip,$(CONFIG_LIBGFORTRAN_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done endef define Package/libssp/install for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libstdcpp/install for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libc/install for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libpthread/install for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/librt/install for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libatomic/install for file in $(call qstrip,$(CONFIG_LIBATOMIC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef