mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gcc/gcc-final: add a target variant in charge of target installation

Browse Source 
This commit adds a target package "gcc-final", which is a target
package responsible for installing the gcc runtime libraries to
STAGING_DIR and TARGET_DIR. This task was so far done by the host
gcc-final package.

The motivation for splitting it up into a target package is to be able
to properly handle the licensing situation of GCC, where the host part
of GCC (the compiler itself) is under GPLv3, but the runtime libraries
on the target are under GPLv3-with-exception. So far, we were not
handling at all the license of gcc.

So what this commit does is:

 * Add a gcc-final target package, which is depended on by the
   toolchain-buildroot package, and which depends on
   host-gcc-final.

 * Moves to gcc-final the logic for installing target/staging
   libraries

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:22 +02:00
committed by Romain Naour
parent cc36341877
commit bfcddf0570
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/gcc/Config.in Normal file
View File

@@ -0,0 +1,3 @@
config BR2_PACKAGE_GCC_FINAL
bool
default y if BR2_TOOLCHAIN_BUILDROOT

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

@@ -8,6 +8,11 @@ GCC_FINAL_VERSION = $(GCC_VERSION)
GCC_FINAL_SITE = $(GCC_SITE) GCC_FINAL_SITE = $(GCC_SITE)
GCC_FINAL_SOURCE = $(GCC_SOURCE) GCC_FINAL_SOURCE = $(GCC_SOURCE)
GCC_FINAL_DEPENDENCIES = host-gcc-final
GCC_FINAL_ADD_TOOLCHAIN_DEPENDENCY = NO
GCC_FINAL_INSTALL_STAGING = YES
GCC_FINAL_DL_SUBDIR = gcc
HOST_GCC_FINAL_DL_SUBDIR = gcc HOST_GCC_FINAL_DL_SUBDIR = gcc
HOST_GCC_FINAL_DEPENDENCIES = \ HOST_GCC_FINAL_DEPENDENCIES = \
@@ -135,68 +140,63 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL
# -cc symlink to the wrapper is not created. # -cc symlink to the wrapper is not created.
HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS
HOST_GCC_FINAL_LIBS = libgcc_s libatomic GCC_FINAL_LIBS = libgcc_s libatomic
ifeq ($(BR2_INSTALL_LIBSTDCPP),y) ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
HOST_GCC_FINAL_USR_LIBS += libstdc++ GCC_FINAL_USR_LIBS += libstdc++
endif endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_DLANG),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT_DLANG),y)
HOST_GCC_FINAL_USR_LIBS += libgdruntime libgphobos GCC_FINAL_USR_LIBS += libgdruntime libgphobos
endif endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN),y)
HOST_GCC_FINAL_USR_LIBS += libgfortran GCC_FINAL_USR_LIBS += libgfortran
# fortran needs quadmath on x86 and x86_64 # fortran needs quadmath on x86 and x86_64
ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y)
HOST_GCC_FINAL_USR_LIBS += libquadmath GCC_FINAL_USR_LIBS += libquadmath
endif endif
endif endif
ifeq ($(BR2_GCC_ENABLE_OPENMP),y) ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
HOST_GCC_FINAL_USR_LIBS += libgomp GCC_FINAL_USR_LIBS += libgomp
endif endif
HOST_GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS)) GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS))
define HOST_GCC_FINAL_INSTALL_STAGING_LIBS define GCC_FINAL_INSTALL_STAGING_CMDS
$(foreach lib,$(HOST_GCC_FINAL_LIBS), \ $(foreach lib,$(GCC_FINAL_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \
$(STAGING_DIR)/lib/ $(STAGING_DIR)/lib/
) )
$(foreach lib,$(HOST_GCC_FINAL_USR_LIBS), \ $(foreach lib,$(GCC_FINAL_USR_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib)* \
$(STAGING_DIR)/usr/lib/ $(STAGING_DIR)/usr/lib/
) )
endef endef
ifeq ($(BR2_STATIC_LIBS),) ifeq ($(BR2_STATIC_LIBS),)
define HOST_GCC_FINAL_INSTALL_TARGET_LIBS define GCC_FINAL_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/lib $(TARGET_DIR)/usr/lib mkdir -p $(TARGET_DIR)/lib $(TARGET_DIR)/usr/lib
$(foreach lib,$(HOST_GCC_FINAL_LIBS), \ $(foreach lib,$(GCC_FINAL_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(TARGET_DIR)/lib/ $(TARGET_DIR)/lib/
) )
$(foreach lib,$(HOST_GCC_FINAL_USR_LIBS), \ $(foreach lib,$(GCC_FINAL_USR_LIBS), \
cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \
$(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/lib/
) )
endef endef
endif endif
define HOST_GCC_FINAL_INSTALL_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
# coldfire is not working without removing these object files from libgcc.a # coldfire is not working without removing these object files from libgcc.a
ifeq ($(BR2_m68k_cf),y) ifeq ($(BR2_m68k_cf),y)
define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP define GCC_FINAL_M68K_LIBGCC_FIXUP
find $(STAGING_DIR) -name libgcc.a -print | \ find $(STAGING_DIR) -name libgcc.a -print | \
while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done
endef endef
HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP GCC_FINAL_POST_INSTALL_STAGING_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP
endif endif
$(eval $(generic-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))

1
toolchain/toolchain-buildroot/Config.in
View File

@@ -111,4 +111,5 @@ source "package/uclibc/Config.in"
source "package/glibc/Config.in" source "package/glibc/Config.in"
source "package/binutils/Config.in.host" source "package/binutils/Config.in.host"
source "package/gcc/Config.in.host" source "package/gcc/Config.in.host"
source "package/gcc/Config.in"
endif endif

4
toolchain/toolchain-buildroot/toolchain-buildroot.mk
View File

@@ -6,11 +6,11 @@
BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC)) BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
# Triggering the build of the host-gcc-final will automatically do the # Triggering the build of the gcc-final will automatically do the
# build of binutils, uClibc, kernel headers and all the intermediate # build of binutils, uClibc, kernel headers and all the intermediate
# gcc steps. # gcc steps.
TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_DEPENDENCIES = gcc-final
TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO