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