diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-09-21 17:32:10 -0700 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-09-28 08:39:00 +0200 |
| commit | 493b0f3f575520b35b6b01341b28147c67e90884 (patch) | |
| tree | 9dda463aefc68eea777c928a674dff75b145f521 /package | |
| parent | 96b59dc383115d9ac54de8031b2c2faa7f4ed757 (diff) | |
| download | upstream-493b0f3f575520b35b6b01341b28147c67e90884.tar.gz upstream-493b0f3f575520b35b6b01341b28147c67e90884.tar.bz2 upstream-493b0f3f575520b35b6b01341b28147c67e90884.zip | |
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 <f.fainelli@gmail.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/libs/toolchain/Makefile | 40 |
1 files changed, 16 insertions, 24 deletions
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 |