From 4ca1132b28bf976550e4ca08230de630eed358ed Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Dec 2021 14:07:00 +0100 Subject: git: upgrade 2.34.0 -> 2.34.1 The issue with COMPUTE_HEADER_DEPENDENCIES has been reported upstream, as it causes build races: https://lore.kernel.org/git/20211207113101.69686-1-alex.kanavin@gmail.com/T/#u (From OE-Core rev: 83635a1925e2d69344ea3f7b66f6b735b48f9eb7) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 1 + meta/recipes-devtools/git/git_2.34.0.bb | 10 ---------- meta/recipes-devtools/git/git_2.34.1.bb | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.34.0.bb create mode 100644 meta/recipes-devtools/git/git_2.34.1.bb (limited to 'meta/recipes-devtools/git') diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 9dd2cf4549..1d74270fdd 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -33,6 +33,7 @@ inherit autotools-brokensep perlnative bash-completion EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" +EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no" EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" do_compile:prepend () { diff --git a/meta/recipes-devtools/git/git_2.34.0.bb b/meta/recipes-devtools/git/git_2.34.0.bb deleted file mode 100644 index fa9299b494..0000000000 --- a/meta/recipes-devtools/git/git_2.34.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require git.inc - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" - -SRC_URI[tarball.sha256sum] = "0ce6222bfd31938b29360150286b51c77c643fa97740b1d35b6d1ceef8b0ecd7" -SRC_URI[manpages.sha256sum] = "fe66a69244def488306c3e05c1362ea53d8626d2a7e57cd7311df2dab1ef8356" - diff --git a/meta/recipes-devtools/git/git_2.34.1.bb b/meta/recipes-devtools/git/git_2.34.1.bb new file mode 100644 index 0000000000..24081764a2 --- /dev/null +++ b/meta/recipes-devtools/git/git_2.34.1.bb @@ -0,0 +1,9 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.sha256sum] = "fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1" +SRC_URI[manpages.sha256sum] = "220f1ed68582caeddf79c4db15e4eaa4808ec01fd11889e19232f0a74d7f31b0" -- cgit v1.2.3-54-g00ecf