From patchwork Wed Dec 23 06:33:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1419621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=gazMxtLK; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=A4JvomI8; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D13NB2Z3nz9sVm for ; Wed, 23 Dec 2020 17:34:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=UUQckbwEX4LHProQy3JqZ1wgzsTnj6Di0bme9UDvWLM=; b=gazMxtLKyCcmy1SwDFRIcoxIUW CJnaEQkIGk3WXSWi0cIDoxDScNBcDtaZf21rcYtDBjuEaAi03YtYaiwhYa5TF3ZEiDXcBpn0APGCO n21kehZPIQkj1FFNB8SDnbF+LbfzHdE0ZmBk2RrOlQ7bZyshFRRFNCv7zhZmOI7FjS7dfZhUq+yF5 rAUXQrBMaNhwLgOXVlNbMUQTTeLmm0TJelihxsxbeVIatx60X2qJXV+wG8HGAnWPKjV2LK+AuDr1Q WQSEDtQtH/tv4PPNf0XFgdaLOIJtiCDiHhsONRGiTU+gLj+YbizGaohSF8HS3NFenVmK8jc3fq439 goSHkT1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krxi2-0006vu-HU; Wed, 23 Dec 2020 06:33:18 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krxhz-0006vA-Gx for openwrt-devel@lists.openwrt.org; Wed, 23 Dec 2020 06:33:16 +0000 Received: by mail-pj1-x1030.google.com with SMTP id m5so2651916pjv.5 for ; Tue, 22 Dec 2020 22:33:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VqIlgGDlmsRlOzRO2aIeAruWOh8VUIa/XXOrv8ICm6Y=; b=A4JvomI8N59iBlNg/9A1EELCHesrPxkX2+B+OlhshcaNQcWq9coaS69z2lWtdUtYPu 2ewYgTnMdRnegHLa7wrLCZzUvSfJ+obYcf/xgmGoTcXxe8Pu1WultNupePkqeCB8c38P 0h5QaE14OHlxY4mU4jm6eO/NH2eKeFdpulFy71BDUuEVaxabPnnq01uiILQlq9ivzcWY X2o4D+OxQsEd8OuAQxHef8D1J7bDMDcRUROTq/v7izoKXTuZn3v4mdo6fz+KLIMSabT/ l7lvGPwjQ+VrzB90RBnKv/kFEiZknFM96jJh5ZUtp97hZVJK9a0xVKew35hPrNFGbfcU 17vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VqIlgGDlmsRlOzRO2aIeAruWOh8VUIa/XXOrv8ICm6Y=; b=ZXxYMz3OhjXvjCNEuCOkYaoEhJR3ufGyZhi07hFXweVamOfrGYDT0HiVeMEFTKR6Ao uKzuJua0MnZEekYgb40NNHHMASufJh1xs0PJqUDcDnI0S/gKaBC1bnewb4YRmkg3Mf0n XDboSiKSJKn2pyhYOGDk4y4btAb51Leu2i7VfbThrI+iZxgj1Z0IJF8y6jUz8+mp0wAL aeYx1bjRPdgpbjI+o7q8HwXu8+fEwRp9lCJ2o8dGnLzDtLGNI5mLS8BRO+7PWEIdsm47 Okklv41EKAMBoIR8qtTVtPg+aW8Z5vCPb25n20n5nouMTyzjm/Do5huAzeUlzvpgzojz jJsA== X-Gm-Message-State: AOAM533qdorvU70IUbNnAGIeMGTQJLbKfYjM30KsY0XJ61BhuAPwTb+5 HyYztK01ZIn9KGXdtgPxK+XtCGNat43LRw== X-Google-Smtp-Source: ABdhPJwENLRdIs2Y81nIRYyy8OihIUvX8B7zGHpy2BwS2Hk6pZXMN08Tb4UcnQo4UFhVOSsDn/dA5Q== X-Received: by 2002:a17:902:b416:b029:dc:3657:9265 with SMTP id x22-20020a170902b416b02900dc36579265mr16997647plr.24.1608705193102; Tue, 22 Dec 2020 22:33:13 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id i10sm11178930pgt.85.2020.12.22.22.33.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Dec 2020 22:33:12 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv3] ccache: update to 4.1 Date: Tue, 22 Dec 2020 22:33:11 -0800 Message-Id: <20201223063311.695894-1-rosenp@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_013315_593444_CD7D82B9 X-CRM114-Status: GOOD ( 13.85 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1030 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Upstream switched to building with CMake. Adjust accordingly. Reapplied patch as upstream changed the file format. Added HOST_BUILD_PARALLEL for faster compilation. Added cmake tool dependency. Adjusted dependent tools to use NOCACHE as they are needed to build ccache. Signed-off-by: Rosen Penev --- v3: zstd was missing in the commit for some reason v2: fix compilation issues without OS tools. tools/Makefile | 1 + tools/ccache/Makefile | 17 +++++++++-------- tools/ccache/patches/100-honour-copts.patch | 20 ++++++++++---------- tools/libressl/Makefile | 1 + tools/pkgconf/Makefile | 2 ++ tools/zstd/Makefile | 1 + 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index c66d4fb991..316ffb5ea6 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -82,6 +82,7 @@ endif ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) $(foreach tool, $(filter-out xz patch,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile)) tools-y += ccache +$(curdir)/ccache/compile := $(curdir)/cmake/compile $(curdir)/zstd/compile endif # in case there is no patch tool on the host we need to make patch tool a diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index 6e55001fd5..e016e0beb3 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -8,25 +8,26 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=3.7.11 +PKG_VERSION:=4.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=8d450208099a4d202bd7df87caaec81baee20ce9dd62da91e9ea7b95a9072f68 +PKG_HASH:=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99 + +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk -HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)" +CMAKE_HOST_OPTIONS += \ + -DCMAKE_C_COMPILER_LAUNCHER="" \ + -DCMAKE_CXX_COMPILER_LAUNCHER="" define Host/Install/ccache $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(CP) ./files/* $(STAGING_DIR_HOST)/bin/ endef -define Host/Clean - -$(MAKE) -C $(HOST_BUILD_DIR) uninstall - $(call Host/Clean/Default) -endef define Host/Install $(call Host/Install/Default) $(call Host/Install/ccache) diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index ccfa1c0247..e4045ef9be 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,10 +1,10 @@ ---- a/src/ccache.c -+++ b/src/ccache.c -@@ -2277,6 +2277,7 @@ calculate_object_hash(struct args *args, - "CPLUS_INCLUDE_PATH", - "OBJC_INCLUDE_PATH", - "OBJCPLUS_INCLUDE_PATH", // clang -+ "GCC_HONOUR_COPTS", - NULL - }; - for (const char **p = envvars; *p; ++p) { +--- a/src/ccache.cpp ++++ b/src/ccache.cpp +@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx, + "CPLUS_INCLUDE_PATH", + "OBJC_INCLUDE_PATH", + "OBJCPLUS_INCLUDE_PATH", // clang ++ "GCC_HONOUR_COPTS", + nullptr}; + for (const char** p = envvars; *p; ++p) { + const char* v = getenv(*p); diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile index dbd8ca4d1a..2b5a33450c 100644 --- a/tools/libressl/Makefile +++ b/tools/libressl/Makefile @@ -23,6 +23,7 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +HOSTCC := $(HOSTCC_NOCACHE) HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests HOST_CFLAGS += $(FPIC) diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile index 7d785aae39..0f56de0e29 100644 --- a/tools/pkgconf/Makefile +++ b/tools/pkgconf/Makefile @@ -19,6 +19,8 @@ include $(INCLUDE_DIR)/host-build.mk unexport PKG_CONFIG +HOSTCC := $(HOSTCC_NOCACHE) + define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install mv $(STAGING_DIR_HOST)/bin/pkgconf $(STAGING_DIR_HOST)/bin/pkg-config.real diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile index 7459725e8e..ec85362544 100644 --- a/tools/zstd/Makefile +++ b/tools/zstd/Makefile @@ -15,6 +15,7 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +HOSTCC := $(HOSTCC_NOCACHE) HOST_MAKE_FLAGS = PREFIX=$(HOST_BUILD_PREFIX) HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0 $(eval $(call HostBuild))