From patchwork Sat Aug 25 15:47:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 962189 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VhTlhwwS"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41yMx50gXvz9s4V for ; Sun, 26 Aug 2018 01:47:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C840322173; Sat, 25 Aug 2018 15:47:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qub5U8fhb-Aq; Sat, 25 Aug 2018 15:47:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9C6F722071; Sat, 25 Aug 2018 15:47:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 241641C023D for ; Sat, 25 Aug 2018 15:47:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1E0668560E for ; Sat, 25 Aug 2018 15:47:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4jdHqG2-O3nu for ; Sat, 25 Aug 2018 15:47:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 447C785036 for ; Sat, 25 Aug 2018 15:47:45 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id j192-v6so4310523wmj.1 for ; Sat, 25 Aug 2018 08:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mhLMBBJJJpmPoTPJsoM8DfpzfEgwwXrbDaAbSkcnfho=; b=VhTlhwwSjthDO31MpKA+0BFHM2nvbVeMVhDmoCne0oiqF04FD5OSdHdllH5p7kIDHL BJuO0vmwf6kmlN/qOWw3fbxqtzkyF6Pah+EhPbtMGPfp7AY3/Wdy2fzRhJj8TH32vAVa 4WDs3Jw8+G+RnxjvIeDxuwZkg2cimCv5AFHSA4rwS5gN492bHuuyQLs8ID4sgSMh+hIX 4A7MZvdu3f+BiZgtPIz+aUUPA2HS3Vq8agk3szzvK/MPGHremdumQti97IeEyzyX9Msr 0hhfcgFUOGrLt1RsiCSt5XhrTWJaVQ/XUp0nTGe03OyTOfGblXiQRoRwQCfbIJGghrEp ZMqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mhLMBBJJJpmPoTPJsoM8DfpzfEgwwXrbDaAbSkcnfho=; b=DELCLcdwy3qDHRCemE0OgeNT8sFb7/ZL1wqyuEo0sUFHmC31y25p7QX0EKlxrGqiuE D8QA6xkl4SR8qixwKzfyuh7kcmJ1FDuL4xVvs0VG4HI//yeaIy7toXAsGcHW28q89XrJ p1OG1okmisGdks8T2Ok3+5152om5gLJ4qWD+DFKsZoLh5EIFrgb7fxtDi4PlwFQH7JmV f0FuLkIXv2D7FJmbmPxjb+9PGx+aSy0lXVeLKP1bxZpE1FfNffVrAlQvq8XNVd8MaOV6 rMivvc25OiOkoMi05kImPjtRwZkbX+wFydBlDLRTNiTFA+ncchQmSsou45qlEgmtE9Vi PO6A== X-Gm-Message-State: APzg51ACvCmN2e6uSDLMbmNHFp/Flsigg9EzUG4eDaKDFusk9qbirFA0 +R8reXxjk/YdlYDJXLiWmUWgElCI X-Google-Smtp-Source: ANB0Vdbjy+owkRYEOTJ6dpPRU1xZQf0jT0GOqemE+2LpYBSnB2tJlyG90B8PoFwxjlo4J04n+JnBCg== X-Received: by 2002:a1c:9945:: with SMTP id b66-v6mr1353921wme.159.1535212063495; Sat, 25 Aug 2018 08:47:43 -0700 (PDT) Received: from localhost.localdomain (bzq-84-108-5-46.cablep.bezeqint.net. [84.108.5.46]) by smtp.gmail.com with ESMTPSA id d10-v6sm14884573wrv.70.2018.08.25.08.47.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Aug 2018 08:47:42 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Sat, 25 Aug 2018 18:47:37 +0300 Message-Id: <20180825154737.18531-1-asafka7@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] ccache: bump to version 3.4.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update license info, and remove the patch since it's already on upstream. Signed-off-by: Asaf Kahlon --- ...t-to-sysroot-option-to-relative-path.patch | 43 ------------------- package/ccache/ccache.hash | 7 +-- package/ccache/ccache.mk | 8 ++-- 3 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch diff --git a/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch b/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch deleted file mode 100644 index 33db7d480f..0000000000 --- a/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fe42d6f7b739e8d42811bf46bcccfafa728847a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mathias=20De=20Mar=C3=A9?= -Date: Mon, 19 Sep 2016 10:38:13 +0200 -Subject: [PATCH] Convert argument to '--sysroot' option to relative path - -Previously, only the argument to '--sysroot=' was converted. -This changeset adds support for '--sysroot'. - -Signed-off-by: Brandon Maier -Signed-off-by: Matt Weber ---- - ccache.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/ccache.c b/ccache.c -index 8ffadcc..76139b9 100644 ---- a/ccache.c -+++ b/ccache.c -@@ -2407,6 +2407,21 @@ cc_process_args(struct args *args, struct args **preprocessor_args, - free(option); - continue; - } -+ // Alternate form of specifying sysroot without = -+ if (str_eq(argv[i], "--sysroot")) { -+ if (i == argc-1) { -+ cc_log("Missing argument to %s", argv[i]); -+ stats_update(STATS_ARGS); -+ result = false; -+ goto out; -+ } -+ args_add(stripped_args, argv[i]); -+ char *relpath = make_relative_path(x_strdup(argv[i+1])); -+ args_add(stripped_args, relpath); -+ i++; -+ free(relpath); -+ continue; -+ } - if (str_startswith(argv[i], "-Wp,")) { - if (str_eq(argv[i], "-Wp,-P") - || strstr(argv[i], ",-P,") --- -2.8.3 - diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index c22394b13b..5ed5037ed0 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,3 +1,4 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally -sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz -sha256 190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6 ccache-3.3.5.tar.xz +# sha256 computed locally +sha256 18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2 ccache-3.4.2.tar.xz +sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt +sha256 853e071acb730ca933860a0acf4e44e5dc4bffed6b09503bbcf878e343addcc5 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 9a11d46d30..851939ebda 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,11 +4,11 @@ # ################################################################################ -CCACHE_VERSION = 3.3.5 +CCACHE_VERSION = 3.4.2 CCACHE_SITE = https://www.samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others -CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt +CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt # Force ccache to use its internal zlib. The problem is that without # this, ccache would link against the zlib of the build system, but we @@ -38,8 +38,8 @@ HOST_CCACHE_CONF_ENV = \ HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c - sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/conf.c + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c + sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION