diff mbox series

[AUH] ccache: upgrading to 4.9 SUCCEEDED

Message ID 0101018cc52707bc-0356290f-2e9a-4a38-958c-c1f56b297f81-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] ccache: upgrading to 4.9 SUCCEEDED | expand

Commit Message

auh@yoctoproject.org Jan. 1, 2024, 1:11 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *ccache* to *4.9* has Succeeded.

Next steps:
    - apply the patch: git am 0001-ccache-upgrade-4.8.3-4.9.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From d006a559656f9c88907cb0162703dd74ca677f76 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Mon, 1 Jan 2024 05:56:15 +0000
Subject: [PATCH] ccache: upgrade 4.8.3 -> 4.9

---
 meta/recipes-devtools/ccache/ccache_4.8.3.bb  |  26 --
 meta/recipes-devtools/ccache/ccache_4.9.bb    | 250 ++++++++++++++++++
 .../0001-xxhash.h-Fix-build-with-gcc-12.patch |   6 +-
 3 files changed, 253 insertions(+), 29 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_4.8.3.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_4.9.bb
diff mbox series

Patch

diff --git a/meta/recipes-devtools/ccache/ccache_4.8.3.bb b/meta/recipes-devtools/ccache/ccache_4.8.3.bb
deleted file mode 100644
index 03372aa685..0000000000
--- a/meta/recipes-devtools/ccache/ccache_4.8.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@ 
-SUMMARY = "a fast C/C++ compiler cache"
-DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \
-by caching the result of previous compilations and detecting when the \
-same compilation is being done again. Supported languages are C, C\+\+, \
-Objective-C and Objective-C++."
-HOMEPAGE = "http://ccache.samba.org"
-SECTION = "devel"
-
-LICENSE = "GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=6a6fe0ae4e57592b187ab72fa6d420ec"
-
-DEPENDS = "zstd"
-
-SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
-           file://0001-xxhash.h-Fix-build-with-gcc-12.patch \
-           "
-SRC_URI[sha256sum] = "d59dd569ad2bbc826c0bc335c8ebd73e78ed0f2f40ba6b30069347e63585d9ef"
-
-inherit cmake github-releases
-
-PATCHTOOL = "patch"
-
-BBCLASSEXTEND = "native nativesdk"
-
-PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc"
-PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis"
diff --git a/meta/recipes-devtools/ccache/ccache_4.9.bb b/meta/recipes-devtools/ccache/ccache_4.9.bb
new file mode 100644
index 0000000000..01af040686
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_4.9.bb
@@ -0,0 +1,250 @@ 
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- LICENSE.adoc
+# +++ LICENSE.adoc
+# @@ -72,7 +72,7 @@
+#  
+#  === src/third_party/blake3/blake3_*
+#  
+# -This is a subset of https://github.com/BLAKE3-team/BLAKE3[BLAKE3] 1.4.0 with the
+# +This is a subset of https://github.com/BLAKE3-team/BLAKE3[BLAKE3] 1.5.0 with the
+#  following license:
+#  
+#  ----
+# @@ -441,7 +441,7 @@
+#  
+#  === src/third_party/fmt/*.h and src/third_party/format.cpp
+#  
+# -This is a subset of https://fmt.dev[fmt] 8.1.1 with the following license:
+# +This is a subset of https://fmt.dev[fmt] 10.1.1 with the following license:
+#  
+#  ----
+#  Formatting library for C++
+# @@ -516,7 +516,7 @@
+#  === src/third_party/httplib.*
+#  
+#  cpp-httplib - A C++11 cross-platform HTTP/HTTPS library. Copied from cpp-httplib
+# -v0.12.6 downloaded from https://github.com/yhirose/cpp-httplib[cpp-httplib]. The
+# +v0.14. downloaded from https://github.com/yhirose/cpp-httplib[cpp-httplib]. The
+#  library has the following license:
+#  
+#  ----
+# @@ -574,14 +574,14 @@
+#  ----
+#  
+#  
+# -=== src/third_party/nonstd/expected.hpp
+# +=== src/third_party/nonstd/span.hpp
+#  
+#  This is the single header version of
+# -https://github.com/martinmoene/expected-lite[expected-lite] 0.6.2 with the
+# +https://github.com/martinmoene/span-lite[expected-lite] 0.10.3 with the
+#  following license:
+#  
+#  ----
+# -Copyright (c) 2016-2020 Martin Moene
+# +Copyright (c) 2018-2021 Martin Moene
+#  
+#  Boost Software License - Version 1.0 - August 17th, 2003
+#  
+# @@ -609,38 +609,133 @@
+#  ----
+#  
+#  
+# -=== src/third_party/nonstd/span.hpp
+# -
+# -This is the single header version of
+# -https://github.com/martinmoene/span-lite[expected-lite] 0.10.3 with the
+# -following license:
+# -
+# -----
+# -Copyright (c) 2018-2021 Martin Moene
+# -
+# -Boost Software License - Version 1.0 - August 17th, 2003
+# -
+# -Permission is hereby granted, free of charge, to any person or organization
+# -obtaining a copy of the software and accompanying documentation covered by
+# -this license (the "Software") to use, reproduce, display, distribute,
+# -execute, and transmit the Software, and to prepare derivative works of the
+# -Software, and to permit third-parties to whom the Software is furnished to
+# -do so, all subject to the following:
+# -
+# -The copyright notices in the Software and this entire statement, including
+# -the above license grant, this restriction and the following disclaimer,
+# -must be included in all copies of the Software, in whole or in part, and
+# -all derivative works of the Software, unless such copies or derivative
+# -works are solely in the form of machine-executable object code generated by
+# -a source language processor.
+# -
+# -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# -DEALINGS IN THE SOFTWARE.
+# +=== src/third_party/tl/expected.hpp
+# +
+# +This is https://github.com/TartanLlama/expected[TartanLlama expected] 1.1.0 with
+# +the following license:
+# +
+# +----
+# +Creative Commons Legal Code
+# +
+# +CC0 1.0 Universal
+# +
+# +    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+# +    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+# +    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+# +    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+# +    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+# +    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+# +    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+# +    HEREUNDER.
+# +
+# +Statement of Purpose
+# +
+# +The laws of most jurisdictions throughout the world automatically confer
+# +exclusive Copyright and Related Rights (defined below) upon the creator
+# +and subsequent owner(s) (each and all, an "owner") of an original work of
+# +authorship and/or a database (each, a "Work").
+# +
+# +Certain owners wish to permanently relinquish those rights to a Work for
+# +the purpose of contributing to a commons of creative, cultural and
+# +scientific works ("Commons") that the public can reliably and without fear
+# +of later claims of infringement build upon, modify, incorporate in other
+# +works, reuse and redistribute as freely as possible in any form whatsoever
+# +and for any purposes, including without limitation commercial purposes.
+# +These owners may contribute to the Commons to promote the ideal of a free
+# +culture and the further production of creative, cultural and scientific
+# +works, or to gain reputation or greater distribution for their Work in
+# +part through the use and efforts of others.
+# +
+# +For these and/or other purposes and motivations, and without any
+# +expectation of additional consideration or compensation, the person
+# +associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+# +is an owner of Copyright and Related Rights in the Work, voluntarily
+# +elects to apply CC0 to the Work and publicly distribute the Work under its
+# +terms, with knowledge of his or her Copyright and Related Rights in the
+# +Work and the meaning and intended legal effect of CC0 on those rights.
+# +
+# +1. Copyright and Related Rights. A Work made available under CC0 may be
+# +protected by copyright and related or neighboring rights ("Copyright and
+# +Related Rights"). Copyright and Related Rights include, but are not
+# +limited to, the following:
+# +
+# +  i. the right to reproduce, adapt, distribute, perform, display,
+# +     communicate, and translate a Work;
+# + ii. moral rights retained by the original author(s) and/or performer(s);
+# +iii. publicity and privacy rights pertaining to a person's image or
+# +     likeness depicted in a Work;
+# + iv. rights protecting against unfair competition in regards to a Work,
+# +     subject to the limitations in paragraph 4(a), below;
+# +  v. rights protecting the extraction, dissemination, use and reuse of data
+# +     in a Work;
+# + vi. database rights (such as those arising under Directive 96/9/EC of the
+# +     European Parliament and of the Council of 11 March 1996 on the legal
+# +     protection of databases, and under any national implementation
+# +     thereof, including any amended or successor version of such
+# +     directive); and
+# +vii. other similar, equivalent or corresponding rights throughout the
+# +     world based on applicable law or treaty, and any national
+# +     implementations thereof.
+# +
+# +2. Waiver. To the greatest extent permitted by, but not in contravention
+# +of, applicable law, Affirmer hereby overtly, fully, permanently,
+# +irrevocably and unconditionally waives, abandons, and surrenders all of
+# +Affirmer's Copyright and Related Rights and associated claims and causes
+# +of action, whether now known or unknown (including existing as well as
+# +future claims and causes of action), in the Work (i) in all territories
+# +worldwide, (ii) for the maximum duration provided by applicable law or
+# +treaty (including future time extensions), (iii) in any current or future
+# +medium and for any number of copies, and (iv) for any purpose whatsoever,
+# +including without limitation commercial, advertising or promotional
+# +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+# +member of the public at large and to the detriment of Affirmer's heirs and
+# +successors, fully intending that such Waiver shall not be subject to
+# +revocation, rescission, cancellation, termination, or any other legal or
+# +equitable action to disrupt the quiet enjoyment of the Work by the public
+# +as contemplated by Affirmer's express Statement of Purpose.
+# +
+# +3. Public License Fallback. Should any part of the Waiver for any reason
+# +be judged legally invalid or ineffective under applicable law, then the
+# +Waiver shall be preserved to the maximum extent permitted taking into
+# +account Affirmer's express Statement of Purpose. In addition, to the
+# +extent the Waiver is so judged Affirmer hereby grants to each affected
+# +person a royalty-free, non transferable, non sublicensable, non exclusive,
+# +irrevocable and unconditional license to exercise Affirmer's Copyright and
+# +Related Rights in the Work (i) in all territories worldwide, (ii) for the
+# +maximum duration provided by applicable law or treaty (including future
+# +time extensions), (iii) in any current or future medium and for any number
+# +of copies, and (iv) for any purpose whatsoever, including without
+# +limitation commercial, advertising or promotional purposes (the
+# +"License"). The License shall be deemed effective as of the date CC0 was
+# +applied by Affirmer to the Work. Should any part of the License for any
+# +reason be judged legally invalid or ineffective under applicable law, such
+# +partial invalidity or ineffectiveness shall not invalidate the remainder
+# +of the License, and in such case Affirmer hereby affirms that he or she
+# +will not (i) exercise any of his or her remaining Copyright and Related
+# +Rights in the Work or (ii) assert any associated claims and causes of
+# +action with respect to the Work, in either case contrary to Affirmer's
+# +express Statement of Purpose.
+# +
+# +4. Limitations and Disclaimers.
+# +
+# + a. No trademark or patent rights held by Affirmer are waived, abandoned,
+# +    surrendered, licensed or otherwise affected by this document.
+# + b. Affirmer offers the Work as-is and makes no representations or
+# +    warranties of any kind concerning the Work, express, implied,
+# +    statutory or otherwise, including without limitation warranties of
+# +    title, merchantability, fitness for a particular purpose, non
+# +    infringement, or the absence of latent or other defects, accuracy, or
+# +    the present or absence of errors, whether or not discoverable, all to
+# +    the greatest extent permissible under applicable law.
+# + c. Affirmer disclaims responsibility for clearing rights of other persons
+# +    that may apply to the Work or any use thereof, including without
+# +    limitation any person's Copyright and Related Rights in the Work.
+# +    Further, Affirmer disclaims responsibility for obtaining any necessary
+# +    consents, permissions or other rights required for any use of the
+# +    Work.
+# + d. Affirmer understands and acknowledges that Creative Commons is not a
+# +    party to this document and has no duty or obligation with respect to
+# +    this CC0 or use of the Work.
+#  ----
+#  
+#  
+# 
+#
+
+SUMMARY = "a fast C/C++ compiler cache"
+DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \
+by caching the result of previous compilations and detecting when the \
+same compilation is being done again. Supported languages are C, C\+\+, \
+Objective-C and Objective-C++."
+HOMEPAGE = "http://ccache.samba.org"
+SECTION = "devel"
+
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=11b0b581dd56bbac4f5de214d47927ca"
+
+DEPENDS = "zstd"
+
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
+           file://0001-xxhash.h-Fix-build-with-gcc-12.patch \
+           "
+SRC_URI[sha256sum] = "866b2223d59333640f0e7a003cbb85b32d9ca3c9445bd9e3cf142942e69dd3ec"
+
+inherit cmake github-releases
+
+PATCHTOOL = "patch"
+
+BBCLASSEXTEND = "native nativesdk"
+
+PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc"
+PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis"
diff --git a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
index 67c74a1e8e..33372061e5 100644
--- a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
+++ b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
@@ -1,4 +1,4 @@ 
-From 550834a3ec2e05e379be63b084e7fa06a1723f84 Mon Sep 17 00:00:00 2001
+From 648fc462fbfb4bdbdb2ae667382ad2c7aea0a31f Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Mon, 6 Jun 2022 17:53:20 +0800
 Subject: [PATCH] xxhash.h: Fix build with gcc-12
@@ -23,10 +23,10 @@  Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h
-index 08ab794..c754e99 100644
+index a18e8c7..1b72307 100644
 --- a/src/third_party/xxhash.h
 +++ b/src/third_party/xxhash.h
-@@ -1501,7 +1501,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
+@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
  #  define XXH_NO_INLINE static
  /* enable inlining hints */
  #elif defined(__GNUC__) || defined(__clang__)