NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gcc/gcc-final: split lib install by target/staging

Browse Source 
Right now the library installation was split between installation of
static libs vs. shared libs. In preparation for additional rework, it
makes more sense to split it between target installation and staging
installation.

For staging installation we simply install $(lib)* so that both static
and shared libraries are copied.

For target installation, we only install when shared libraries are
used, and we copy $(lib).so*

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Thomas Petazzoni 2023-09-30 09:54:20 +02:00 committed by Romain Naour
parent 21eb27c76e
commit f2bad2e0bf
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/gcc/gcc-final/gcc-final.mk
View File

@ -168,28 +168,25 @@ endif
HOST_GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS))
define HOST_GCC_FINAL_INSTALL_STATIC_LIBS
define HOST_GCC_FINAL_INSTALL_STAGING_LIBS
$(foreach lib,$(HOST_GCC_FINAL_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).a \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \
$(STAGING_DIR)/lib/
)
$(foreach lib,$(HOST_GCC_FINAL_USR_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).a \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \
$(STAGING_DIR)/usr/lib/
)
endef
ifeq ($(BR2_STATIC_LIBS),)
define HOST_GCC_FINAL_INSTALL_SHARED_LIBS
define HOST_GCC_FINAL_INSTALL_TARGET_LIBS
mkdir -p $(TARGET_DIR)/lib $(TARGET_DIR)/usr/lib
$(foreach lib,$(HOST_GCC_FINAL_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(STAGING_DIR)/lib/ && \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(TARGET_DIR)/lib/
)
$(foreach lib,$(HOST_GCC_FINAL_USR_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(STAGING_DIR)/usr/lib/ && \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(TARGET_DIR)/usr/lib/
)
@ -197,9 +194,8 @@ endef
endif
define HOST_GCC_FINAL_INSTALL_LIBS
mkdir -p $(TARGET_DIR)/lib $(TARGET_DIR)/usr/lib
$(HOST_GCC_FINAL_INSTALL_STATIC_LIBS)
$(HOST_GCC_FINAL_INSTALL_SHARED_LIBS)
$(HOST_GCC_FINAL_INSTALL_STAGING_LIBS)
$(HOST_GCC_FINAL_INSTALL_TARGET_LIBS)
endef
HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBS