[meta-mingw] [PATCH] libgcrypt: drop 1.8.x append and patch


Alexander Kanavin
 

1.9.x no longer requires this, as the code has been
refactored into an external script that has defaults
and a guard for .git directory.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-mym4_revision-to-0-if-not-a-git-rep.patch | 46 -------------------
.../libgcrypt/libgcrypt_1.8.%.bbappend | 6 ---
2 files changed, 52 deletions(-)
delete mode 100644 recipes-support/libgcrypt/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch
delete mode 100644 recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend

diff --git a/recipes-support/libgcrypt/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch b/recipes-support/libgcrypt/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch
deleted file mode 100644
index b7b407a..0000000
--- a/recipes-support/libgcrypt/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bb6f9e18b5ccef26978f3f3ed2fe7bf3d4d498e7 Mon Sep 17 00:00:00 2001
-From: Nathan Rossi <nathan@nathanrossi.com>
-Date: Fri, 30 Dec 2016 18:02:26 +1000
-Subject: [PATCH] configure.ac: Set 'mym4_revision' to 0 if not a git repo
-
----
-It is possible for the source to not be located in a git repository
-(e.g. source is from a tarball). In which case the git repository
-information is not available. This results in the mym4_revision being an
-empty string however this value is used in BUILD_FILEVERSION where it is
-assumed to be 4 decimal values. Additionally BUILD_REVISION uses this
-value and is also assumed to be non-empty.
-
-In the case of BUILD_FILEVERSION it is used in versioninfo.rc.in, where
-it must be populated as 4 decimal values due to the expected syntax. In
-cases where it is not (e.g. when BUILD_FILEVERSION = '1,7,5,' a syntax
-error is raised.
-
- windres: versioninfo.rc.in:21: syntax error
-
-This patch changes mym4_revision so that if the 'git rev-parse' returns
-non-zero (e.g. not in a git repository) the value falls back to '0'.
-This propagates as '0' to both BUILD_FILEVERSION and BUILD_REVISION.
-
-Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-Upstream-Status: Submitted
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 31c0d553fa..a3deffa6e9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,7 @@ m4_define(mym4_version_micro, [0])
- m4_define(mym4_version,
- [mym4_version_major.mym4_version_minor.mym4_version_micro])
- m4_define([mym4_revision],
-- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-+ m4_esyscmd([(git rev-parse --short HEAD || printf '0') | tr -d '\n\r']))
- m4_define([mym4_revision_dec],
- m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
- m4_define([mym4_betastring],
---
-2.11.0
-
diff --git a/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend b/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend
deleted file mode 100644
index 3da0f53..0000000
--- a/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-
-FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/files:"
-SRC_URI_append_mingw32 = " \
- file://configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch \
- "
-
--
2.29.2

Join yocto@lists.yoctoproject.org to automatically receive all group messages.