From patchwork Sat Sep 30 07:54:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841542 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKHv73GMz1yng for ; Sat, 30 Sep 2023 17:54:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3602480CBB; Sat, 30 Sep 2023 07:54:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3602480CBB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nDzvULb-zSPI; Sat, 30 Sep 2023 07:54:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 3527280D20; Sat, 30 Sep 2023 07:54:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3527280D20 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CCDE91BF86B for ; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A396842DFD for ; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A396842DFD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K4sYZkNGgglQ for ; Sat, 30 Sep 2023 07:54:31 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1CAD542DFC for ; Sat, 30 Sep 2023 07:54:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1CAD542DFC Received: by mail.gandi.net (Postfix) with ESMTPA id E521440005; Sat, 30 Sep 2023 07:54:28 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:17 +0200 Message-ID: <20230930075426.513345-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FocqeQ6yTz9nL13027iUmERuzq7MS49cdTLN/1JfF9w=; b=cmLThh9Zo4tpwqkjbOYsJDlm77izZPvRKDmLH6VFNOUCKpNTYwEypoFrnwr+DsX/TDB0IC +AI84m3wryoFd5yBHhanR5/OsisZX84AO9PKQkjGG9U9PYW/0OEcmaEqXRylwyfRHZ3YCh g8fvw8ahPVegW0Zh0EPRBkhi4TPDo3dxNR1zcNUT31xFH5fBcQNiM7sXkIALxtSCiMYhLW mdmwlwKp/21qYOmKvz4T0C5sC1jdTLXWx075pnd0TtbGnFw1LT9L5vmTvApeCZasBLpbcD rgTa+PItnyYz/nNCMwnwXu7ypB8Js3iYhlgWgiaMO9UcdtPTpnRe/RS3CHPXrQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=cmLThh9Z Subject: [Buildroot] [PATCH v2 1/7] package/gcc/gcc-final: rework installation of libgcc_s/libatomic X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The installation of libgcc_s/libatomic (which have to go in /lib) is handled differently than all the other libraries (which go in /usr/lib). For consistency, and in preparation for additional changes in this area, handle both in a more consistent manner, with a new HOST_GCC_FINAL_LIBS that looks like HOST_GCC_FINAL_USR_LIBS. Consequently, the hook HOST_GCC_FINAL_INSTALL_USR_LIBS is renamed to HOST_GCC_FINAL_INSTALL_LIBS, and made unconditional rather than being conditional on ifneq ($(HOST_GCC_FINAL_USR_LIBS),). Indeed, we now need to install libraries in /lib unconditionally, and if HOST_GCC_FINAL_USR_LIBS is empty, the loops will simply not iterate on any element, and they will not install anything in /usr/lib. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 38 +++++++++++------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index aa883beb7b..0b390d1b10 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -144,25 +144,7 @@ endef HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP endif -# Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want -# libgcc_s to be installed in /lib and not /usr/lib. -define HOST_GCC_FINAL_INSTALL_LIBGCC - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libgcc_s* \ - $(STAGING_DIR)/lib/ - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libgcc_s* \ - $(TARGET_DIR)/lib/ -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBGCC - -define HOST_GCC_FINAL_INSTALL_LIBATOMIC - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libatomic* \ - $(STAGING_DIR)/lib/ - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libatomic* \ - $(TARGET_DIR)/lib/ -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBATOMIC +HOST_GCC_FINAL_LIBS = libgcc_s libatomic # Handle the installation of libraries in /usr/lib HOST_GCC_FINAL_USR_LIBS = @@ -189,8 +171,11 @@ endif HOST_GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS)) -ifneq ($(HOST_GCC_FINAL_USR_LIBS),) define HOST_GCC_FINAL_INSTALL_STATIC_LIBS + for i in $(HOST_GCC_FINAL_LIBS) ; do \ + cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.a \ + $(STAGING_DIR)/lib/ ; \ + done for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.a \ $(STAGING_DIR)/usr/lib/ ; \ @@ -199,6 +184,12 @@ endef ifeq ($(BR2_STATIC_LIBS),) define HOST_GCC_FINAL_INSTALL_SHARED_LIBS + for i in $(HOST_GCC_FINAL_LIBS) ; do \ + cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ + $(STAGING_DIR)/lib/ ; \ + cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ + $(TARGET_DIR)/lib/ ; \ + done for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ $(STAGING_DIR)/usr/lib/ ; \ @@ -208,12 +199,11 @@ define HOST_GCC_FINAL_INSTALL_SHARED_LIBS endef endif -define HOST_GCC_FINAL_INSTALL_USR_LIBS - mkdir -p $(TARGET_DIR)/usr/lib +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) endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_USR_LIBS -endif +HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBS $(eval $(host-autotools-package)) From patchwork Sat Sep 30 07:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841543 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKJC1YYBz1yp7 for ; Sat, 30 Sep 2023 17:55:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7338E8122A; Sat, 30 Sep 2023 07:55:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7338E8122A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b4vxXqgnunTv; Sat, 30 Sep 2023 07:55:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7385081249; Sat, 30 Sep 2023 07:55:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7385081249 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0C4621BF681 for ; Sat, 30 Sep 2023 07:54:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D336C83D15 for ; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D336C83D15 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fSAUxLUSKJRX for ; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp1.osuosl.org (Postfix) with ESMTPS id 018C582EAD for ; Sat, 30 Sep 2023 07:54:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 018C582EAD Received: by mail.gandi.net (Postfix) with ESMTPA id D60F840007; Sat, 30 Sep 2023 07:54:29 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:18 +0200 Message-ID: <20230930075426.513345-3-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O1YgR1v972MxgalvOohUo760rPklzEFJLmyf2ONmlhE=; b=mGhacC714f31lGKZukSXthjnGTBh5UTPezPgQn3EsSYKrwuFUMKIdzIAbAG1qJ+sQXZkxF HdC4T6sV7mH1qUJ/hmFTLuieFQiSS3UgadLxjZTBQXm2r0+uFV1KWG8LojlPFszbu+eTKu XKQ267CkxcElw8nLIZ5JhqVitPii9HOKVK74eodx4+L+38B1mTQ4pH8HkRVACwjBqE5hSz yShc58zSoAKWoARJ4MFISF7wfRv8Lqi9jmB3f2RiWklbsVqTMK4neW5+TE9I1j0pDitFLz E1QSEuuSiBRwZRTgnjonQJUbIutfrwYIMBv6lS/1jkpul8y47+p1F/emU9I7Kg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=mGhacC71 Subject: [Buildroot] [PATCH v2 2/7] package/gcc/gcc-final: remove useless comment and empty variable X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We typically don't define empty variables in Buildroot, and the comment is a bit useless, so drop both. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 0b390d1b10..0f94579ac4 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -146,9 +146,6 @@ endif HOST_GCC_FINAL_LIBS = libgcc_s libatomic -# Handle the installation of libraries in /usr/lib -HOST_GCC_FINAL_USR_LIBS = - ifeq ($(BR2_INSTALL_LIBSTDCPP),y) HOST_GCC_FINAL_USR_LIBS += libstdc++ endif From patchwork Sat Sep 30 07:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841545 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKJl5B6mz1yp7 for ; Sat, 30 Sep 2023 17:55:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id EF4D081E5F; Sat, 30 Sep 2023 07:55:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EF4D081E5F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UNZG89vU6d10; Sat, 30 Sep 2023 07:55:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EB5CD81FA7; Sat, 30 Sep 2023 07:55:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EB5CD81FA7 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B5F9B1BF681 for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7D1C542DFD for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7D1C542DFD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fQkAQuh3f4ki for ; Sat, 30 Sep 2023 07:54:33 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by smtp4.osuosl.org (Postfix) with ESMTPS id 09F3742DFC for ; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 09F3742DFC Received: by mail.gandi.net (Postfix) with ESMTPA id C2E2E40003; Sat, 30 Sep 2023 07:54:30 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:19 +0200 Message-ID: <20230930075426.513345-4-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=drzUpVa9lxmMPVEDb925zEjLRPy+WzJFs5n6uCDGZys=; b=KsdaIWF5hm3lcGkUAwt4DbJEneMQ8mozimjE+DE0fwY8ewwDiwwbHgcaiDLXPYf3/T6hpO wyO8X6mL8VNAmQOfxHzQeyGNGK4t4WpudZj9hzcyz4GiuA9IvgxxBTSLhay9GXQ7cKonY8 vi1pbGcj5VG8urmrTmPLse4bQTETYR7qhiJjGWejeYPwTg9yXFXaUzV8WEfb+HtKhP9VyZ Y06XsuOUtKf6fIgfncZNe/f9ZPei1ijuNx5UC6e/cD/lCj1SqbKiS+aq1NY0e8GlAK45Le KnC2N0qTaA1ACl+2VB0c6+ACYtNL0BbbbA6l464YF5467yOGuTr7kCvGzoDKZw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=KsdaIWF5 Subject: [Buildroot] [PATCH v2 3/7] package/gcc/gcc-final: move to make foreach loops X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This provides better error handling, and is more in line with our current coding style. We also replace ";" by "&&" for the same reason of proper error handling. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 0f94579ac4..7951b0f1a9 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -169,30 +169,30 @@ endif HOST_GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS)) define HOST_GCC_FINAL_INSTALL_STATIC_LIBS - for i in $(HOST_GCC_FINAL_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.a \ - $(STAGING_DIR)/lib/ ; \ - done - for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.a \ - $(STAGING_DIR)/usr/lib/ ; \ - done + $(foreach lib,$(HOST_GCC_FINAL_LIBS), \ + cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).a \ + $(STAGING_DIR)/lib/ + ) + $(foreach lib,$(HOST_GCC_FINAL_USR_LIBS), \ + cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).a \ + $(STAGING_DIR)/usr/lib/ + ) endef ifeq ($(BR2_STATIC_LIBS),) define HOST_GCC_FINAL_INSTALL_SHARED_LIBS - for i in $(HOST_GCC_FINAL_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(STAGING_DIR)/lib/ ; \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(TARGET_DIR)/lib/ ; \ - done - for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(STAGING_DIR)/usr/lib/ ; \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(TARGET_DIR)/usr/lib/ ; \ - done + $(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/ + ) endef endif From patchwork Sat Sep 30 07:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841544 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKJT0vNtz1yp7 for ; Sat, 30 Sep 2023 17:55:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 029EB8128B; Sat, 30 Sep 2023 07:55:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 029EB8128B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rxu1_n6Q_Hgg; Sat, 30 Sep 2023 07:55:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id C009781252; Sat, 30 Sep 2023 07:55:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C009781252 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BECBD1BF86B for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9783B83D7F for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9783B83D7F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 63t5MaaOC2dX for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp1.osuosl.org (Postfix) with ESMTPS id AA01F82EAD for ; Sat, 30 Sep 2023 07:54:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AA01F82EAD Received: by mail.gandi.net (Postfix) with ESMTPA id B5E084000A; Sat, 30 Sep 2023 07:54:31 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:20 +0200 Message-ID: <20230930075426.513345-5-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jvtgQexxTjp+zVOPH6uWKzahOLcImwOXY+JS7lO9nvo=; b=WVz6TKKBpXAnQMSmf+TPj3E+TK5DGg+/Z3CsJ3eSnE1M4QlOuOMD3hQxlKpxLajGC/7Tow SVzZ15Nkcf9aC8jBWWQl2uRd4fA85LSzM9zOu36U4tWMbZ6gyvjVdD9ML+AQiZHectEBEV 4Yy8kks2+XnM27jkdPKf+p1oH92bjjhl1ZcE9+8XIbuK7oTqX7BYdekNrmXyeowOziNs6N b/jiN4Lpwqx5SGWo1pd8ig6yIMUaLfIXmFJFAvzTzFwy74tn+sVSF4dleh7T21njpePYWq XWawKaQO8smwHJ9ThMRzHVIwyZKn7lDRuO/hMrHa25xjpdbfh9iExgOv9c0eLg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=WVz6TKKB Subject: [Buildroot] [PATCH v2 4/7] package/gcc/gcc-final: split lib install by target/staging X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" 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 --- package/gcc/gcc-final/gcc-final.mk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 7951b0f1a9..c6ed0e35b9 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -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 From patchwork Sat Sep 30 07:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841546 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKK266h9z1yp7 for ; Sat, 30 Sep 2023 17:55:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F383481F27; Sat, 30 Sep 2023 07:55:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F383481F27 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SBRF8Jqf8zgZ; Sat, 30 Sep 2023 07:55:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 3082B820D3; Sat, 30 Sep 2023 07:55:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3082B820D3 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D94621BF681 for ; Sat, 30 Sep 2023 07:54:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B0E9F42DFC for ; Sat, 30 Sep 2023 07:54:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B0E9F42DFC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GRVMNFGpeEPg for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp4.osuosl.org (Postfix) with ESMTPS id 96ED042E08 for ; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 96ED042E08 Received: by mail.gandi.net (Postfix) with ESMTPA id 96F0140006; Sat, 30 Sep 2023 07:54:32 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:21 +0200 Message-ID: <20230930075426.513345-6-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C1lnURC2KY1IB8JD5rwMCWmQUe3tJOSQjOmhT2cYtoc=; b=DI4e6J451WVgkDn54va/oRrAI3pDCRkUOu5OT7xXm1DgIHq/czSnOsgv0Em/roxZoJzYkX uKu8H1GkPQO0wCYwDhgwL6VaD73hWgMutyG1ckgh2g4zndfB5m5+MuQJxtEaYRPzh5zJZd M9Cr8xugw1yI9MUERlRT0vSYohS48dggb/Hh64zDovNC+sVBdszvOZ4bVDgJYfYPTZvhx5 kp/JRWTtXQtSlDnxFP4i78UqwQUdWNWc2QzEXsB6HfkvF8N0zHEEu2QbmPPG+Ni/oZrWiw Opxku1Z6ubBxHUtuqzYyyxoCAmEPvXq1rwhW4kEanmmxIxfsrcQoJfBPRlKlFg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=DI4e6J45 Subject: [Buildroot] [PATCH v2 5/7] package/gcc/gcc-final: move hook further down X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The HOST_GCC_FINAL_M68K_LIBGCC_FIXUP hook is tweaking the staging directory. In preparation for additional rework, let's move it further down in the file so that the diff of the rework will be easier to look at. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index c6ed0e35b9..ae6aedb2e7 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -135,15 +135,6 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL # -cc symlink to the wrapper is not created. HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS -# coldfire is not working without removing these object files from libgcc.a -ifeq ($(BR2_m68k_cf),y) -define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP - find $(STAGING_DIR) -name libgcc.a -print | \ - while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done -endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP -endif - HOST_GCC_FINAL_LIBS = libgcc_s libatomic ifeq ($(BR2_INSTALL_LIBSTDCPP),y) @@ -199,4 +190,13 @@ define HOST_GCC_FINAL_INSTALL_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 +ifeq ($(BR2_m68k_cf),y) +define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP + find $(STAGING_DIR) -name libgcc.a -print | \ + while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done +endef +HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP +endif + $(eval $(host-autotools-package)) From patchwork Sat Sep 30 07:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841547 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKKH3YNpz1yp7 for ; Sat, 30 Sep 2023 17:56:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B5D8183D88; Sat, 30 Sep 2023 07:56:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B5D8183D88 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XU7MN829fhit; Sat, 30 Sep 2023 07:56:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 4B9688233E; Sat, 30 Sep 2023 07:55:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4B9688233E X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0C0ED1BF681 for ; Sat, 30 Sep 2023 07:54:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D93CE41CD8 for ; Sat, 30 Sep 2023 07:54:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D93CE41CD8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gAsMR7afZC4H for ; Sat, 30 Sep 2023 07:54:36 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8F70B403D6 for ; Sat, 30 Sep 2023 07:54:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8F70B403D6 Received: by mail.gandi.net (Postfix) with ESMTPA id 7BA9D40007; Sat, 30 Sep 2023 07:54:33 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:22 +0200 Message-ID: <20230930075426.513345-7-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AGIz1D7e/S/bGkZFe3Qtvcxu0oL7/+miRl0TlEHYKTY=; b=F2yDxa/nM0kvCSERMkUGBylG72MCZIk4LjgVfp2/cpmgTsbu+AQqfin5AXJdMxc/eO4zfL 5kSDTZiyCr/LLwCE1mcISziNKEfoZx+CVYHeOLjl3WPbe6MKunDrhp4R5BBYUUNUtiVDRH VDxh2goxn9wP0jZ2yXzCZ/Gd55uZxw4GNKN1J8xL7zn8lcSjD98KfDMw7JB+hnfYVhjQTC BoRpGR5UR9f94GtR4VnVvOrVX9b7n7R0GpebRBloncDib76T788YlVpD5ETXzLj5xRwztP T8Fz2dEMrW4O0A0iJqcJY1BzC6HTdrkf8NVKZJEqPNG6aRkyeBhwV7uo5tjDWg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=F2yDxa/n Subject: [Buildroot] [PATCH v2 6/7] package/gcc/gcc-final: add a target variant in charge of target installation X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni , Giulio Benetti , Romain Naour , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" 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 --- package/gcc/Config.in | 3 ++ package/gcc/gcc-final/gcc-final.mk | 42 +++++++++---------- toolchain/toolchain-buildroot/Config.in | 1 + .../toolchain-buildroot.mk | 4 +- 4 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 package/gcc/Config.in diff --git a/package/gcc/Config.in b/package/gcc/Config.in new file mode 100644 index 0000000000..d2a26abba1 --- /dev/null +++ b/package/gcc/Config.in @@ -0,0 +1,3 @@ +config BR2_PACKAGE_GCC_FINAL + bool + default y if BR2_TOOLCHAIN_BUILDROOT diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index ae6aedb2e7..bd18d9ea71 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -8,6 +8,11 @@ GCC_FINAL_VERSION = $(GCC_VERSION) GCC_FINAL_SITE = $(GCC_SITE) 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_DEPENDENCIES = \ @@ -135,68 +140,63 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL # -cc symlink to the wrapper is not created. 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) -HOST_GCC_FINAL_USR_LIBS += libstdc++ +GCC_FINAL_USR_LIBS += libstdc++ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT_DLANG),y) -HOST_GCC_FINAL_USR_LIBS += libgdruntime libgphobos +GCC_FINAL_USR_LIBS += libgdruntime libgphobos endif 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 ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) -HOST_GCC_FINAL_USR_LIBS += libquadmath +GCC_FINAL_USR_LIBS += libquadmath endif endif ifeq ($(BR2_GCC_ENABLE_OPENMP),y) -HOST_GCC_FINAL_USR_LIBS += libgomp +GCC_FINAL_USR_LIBS += libgomp 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 - $(foreach lib,$(HOST_GCC_FINAL_LIBS), \ +define GCC_FINAL_INSTALL_STAGING_CMDS + $(foreach lib,$(GCC_FINAL_LIBS), \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_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)* \ $(STAGING_DIR)/usr/lib/ ) endef 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 - $(foreach lib,$(HOST_GCC_FINAL_LIBS), \ + $(foreach lib,$(GCC_FINAL_LIBS), \ cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$(lib).so* \ $(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* \ $(TARGET_DIR)/usr/lib/ ) endef 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 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 | \ while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done 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 +$(eval $(generic-package)) $(eval $(host-autotools-package)) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 64f7892f98..0173f40d97 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -111,4 +111,5 @@ source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/binutils/Config.in.host" source "package/gcc/Config.in.host" +source "package/gcc/Config.in" endif diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index 6da64b7c77..76862fa2e3 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -6,11 +6,11 @@ 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 # gcc steps. -TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final +TOOLCHAIN_BUILDROOT_DEPENDENCIES = gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO From patchwork Sat Sep 30 07:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1841548 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RyKKY2pNMz1yp7 for ; Sat, 30 Sep 2023 17:56:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9C8A283D4A; Sat, 30 Sep 2023 07:56:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9C8A283D4A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fndexmdv7KWC; Sat, 30 Sep 2023 07:56:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 9920583D97; Sat, 30 Sep 2023 07:56:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9920583D97 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EB27B1BF681 for ; Sat, 30 Sep 2023 07:54:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B3E4F82EAD for ; Sat, 30 Sep 2023 07:54:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B3E4F82EAD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4R9PuiJD4k58 for ; Sat, 30 Sep 2023 07:54:37 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp1.osuosl.org (Postfix) with ESMTPS id 90ABE83D4A for ; Sat, 30 Sep 2023 07:54:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 90ABE83D4A Received: by mail.gandi.net (Postfix) with ESMTPA id 7E3AD40003; Sat, 30 Sep 2023 07:54:34 +0000 (UTC) To: Buildroot List Date: Sat, 30 Sep 2023 09:54:23 +0200 Message-ID: <20230930075426.513345-8-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> References: <20230930075426.513345-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1696060474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x73NG967EuKq8uB3v64JCbwufOxPW8pmWsJRSW7INMM=; b=Us0IpdICcMhVkEREM87qXycDydC4QTt2BSMp3RgM+UQTw59oZS6MNEzI8zsDfksKgEvArd yX094w9DDT/w8H8OliPri1Tl6LpsGQIM2QyeEKE84mE07ZyFKFU8VBpg3g/JVpzMv0vb5E S8smzZNEE1YPiHa1uGBFCzwNn9i80Q9a7Xc9A4EyOV39ILjPKx352owI5h1T09yaVmVXbQ KogB8zj0jlZTMyjW3Ai7FyZpybC3neF4GGaehcWa9359K3RN3E/na+wnV6yHMnX9mvrGbE 0LfjycZLQfjcZFDOTK9soI+VKCxq6ChBW0gYj5MnR05PUf9XCI5kd+oWqMXAmA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=Us0IpdIC Subject: [Buildroot] [PATCH v2 7/7] package/gcc: add license information X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Petazzoni via buildroot From: Thomas Petazzoni Reply-To: Thomas Petazzoni Cc: Giulio Benetti , Romain Naour , Henri Roosen , Stefan Mayrhofer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This commit adds the licensing information for the host-gcc-initial, host-gcc-final and gcc-final packages. For host-gcc-initial and host-gcc-final, instead of duplicating the information, we use common variables coming from gcc.mk. Of course for the target gcc-final, we use a different license than for host-gcc-final, as it's the whole point of this series: be able to describe that the target side of gcc is GPL-3.0 with linking exception. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 4 ++++ package/gcc/gcc-initial/gcc-initial.mk | 2 ++ package/gcc/gcc.hash | 7 +++++++ package/gcc/gcc.mk | 3 +++ 4 files changed, 16 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index bd18d9ea71..11104167af 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -7,6 +7,10 @@ GCC_FINAL_VERSION = $(GCC_VERSION) GCC_FINAL_SITE = $(GCC_SITE) GCC_FINAL_SOURCE = $(GCC_SOURCE) +GCC_FINAL_LICENSE = GPL-3.0-with-GCC-exception +GCC_FINAL_LICENSE_FILES = COPYING.RUNTIME +HOST_GCC_FINAL_LICENSE = $(HOST_GCC_LICENSE) +HOST_GCC_FINAL_LICENSE_FILES = $(HOST_GCC_LICENSE_FILES) GCC_FINAL_DEPENDENCIES = host-gcc-final GCC_FINAL_ADD_TOOLCHAIN_DEPENDENCY = NO diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index a8ac20c5d8..1f8b76a942 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -7,6 +7,8 @@ GCC_INITIAL_VERSION = $(GCC_VERSION) GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) +HOST_GCC_INITIAL_LICENSE = $(HOST_GCC_LICENSE) +HOST_GCC_INITIAL_LICENSE_FILES = $(HOST_GCC_LICENSE_FILES) # We do not have a 'gcc' package per-se; we only have two incarnations, # gcc-initial and gcc-final. gcc-initial is just an internal step that diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index d5f8135ff6..478b0b1620 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -13,3 +13,10 @@ sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b7 sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz + +# Locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING3.LIB +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 9d6b43ce4d8de0c878bf16b54d8e7a10d9bd42b75178153e3af6a815bdc90f74 COPYING.RUNTIME diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index b5bc15963f..4a3b780618 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -18,6 +18,9 @@ GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION) GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz endif +HOST_GCC_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +HOST_GCC_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB + # # Xtensa special hook #