From de4552172315e0ab90b93b8b4b381d6eb57362d1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 5 May 2020 15:01:15 +0200 Subject: git: update to 2.26.2 Disable iconv, as configure.ac attempts to run a cross-compiled test program otherwise. (From OE-Core rev: 6b18acfbe61aef449743f5ce0dfd77f83f5cb2a5) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 1 + meta/recipes-devtools/git/git_2.24.1.bb | 11 ----------- meta/recipes-devtools/git/git_2.26.2.bb | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.24.1.bb create mode 100644 meta/recipes-devtools/git/git_2.26.2.bb (limited to 'meta') diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 4131c98977..544e23c844 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -21,6 +21,7 @@ PACKAGECONFIG[svn] = "" EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ + --without-iconv \ " EXTRA_OECONF_append_class-nativesdk = " --with-gitconfig=/etc/gitconfig " diff --git a/meta/recipes-devtools/git/git_2.24.1.bb b/meta/recipes-devtools/git/git_2.24.1.bb deleted file mode 100644 index daea31eab2..0000000000 --- a/meta/recipes-devtools/git/git_2.24.1.bb +++ /dev/null @@ -1,11 +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.md5sum] = "166bde96adbbc11c8843d4f8f4f9811b" -SRC_URI[tarball.sha256sum] = "ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02" -SRC_URI[manpages.md5sum] = "31c2272a8979022497ba3d4202df145d" -SRC_URI[manpages.sha256sum] = "9a7ae3a093bea39770eb96ca3e5b40bff7af0b9f6123f089d7821d0e5b8e1230" diff --git a/meta/recipes-devtools/git/git_2.26.2.bb b/meta/recipes-devtools/git/git_2.26.2.bb new file mode 100644 index 0000000000..ae7aa267bf --- /dev/null +++ b/meta/recipes-devtools/git/git_2.26.2.bb @@ -0,0 +1,10 @@ +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] = "e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121" +SRC_URI[manpages.sha256sum] = "b3c6cfc980f3c593d0cd0c63e0c97d6f1cafe7b72321fc3a94948758b9529c5b" + -- cgit v1.2.3-54-g00ecf