From: Florian Fainelli <f.faine...@gmail.com>
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.faine...@gmail.com>
---
package/libs/toolchain/Makefile | 40 ++++++++++++++++------------------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index 75a3f3553995..0101b81a318b 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
--
2.9.3
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
