diff options
Diffstat (limited to 'meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 6b9b623b54..82bb4cdb47 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52aae746760ce5b88e61ce994f5055e4ce809821 Mon Sep 17 00:00:00 2001 | 1 | From 0214d886d0153f7288f81213c47dc50f3b9fde20 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 | 3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 |
4 | Subject: [PATCH] support pkgconfig | 4 | Subject: [PATCH] support pkgconfig |
@@ -14,14 +14,14 @@ Signed-off-by: Armin Kuster <akuster808@gmail.com> | |||
14 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 14 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
15 | 15 | ||
16 | --- | 16 | --- |
17 | src/gpg-error.m4 | 160 +---------------------------------------------- | 17 | src/gpg-error.m4 | 161 +---------------------------------------------- |
18 | 1 file changed, 3 insertions(+), 157 deletions(-) | 18 | 1 file changed, 3 insertions(+), 158 deletions(-) |
19 | 19 | ||
20 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 | 20 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 |
21 | index 56a5d07..28920ae 100644 | 21 | index 4b5cd40..c9978d6 100644 |
22 | --- a/src/gpg-error.m4 | 22 | --- a/src/gpg-error.m4 |
23 | +++ b/src/gpg-error.m4 | 23 | +++ b/src/gpg-error.m4 |
24 | @@ -27,157 +27,12 @@ dnl is added to the gpg_config_script_warn variable. | 24 | @@ -27,158 +27,12 @@ dnl is added to the gpg_config_script_warn variable. |
25 | dnl | 25 | dnl |
26 | AC_DEFUN([AM_PATH_GPG_ERROR], | 26 | AC_DEFUN([AM_PATH_GPG_ERROR], |
27 | [ AC_REQUIRE([AC_CANONICAL_HOST]) | 27 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
@@ -137,6 +137,7 @@ index 56a5d07..28920ae 100644 | |||
137 | - fi | 137 | - fi |
138 | - elif test "$GPG_ERROR_CONFIG" != "no"; then | 138 | - elif test "$GPG_ERROR_CONFIG" != "no"; then |
139 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` | 139 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
140 | - unset GPGRT_CONFIG | ||
140 | - fi | 141 | - fi |
141 | - if test "$GPG_ERROR_CONFIG" != "no"; then | 142 | - if test "$GPG_ERROR_CONFIG" != "no"; then |
142 | - req_major=`echo $min_gpg_error_version | \ | 143 | - req_major=`echo $min_gpg_error_version | \ |
@@ -182,7 +183,7 @@ index 56a5d07..28920ae 100644 | |||
182 | fi | 183 | fi |
183 | if test x"$gpg_error_config_host" != xnone ; then | 184 | if test x"$gpg_error_config_host" != xnone ; then |
184 | if test x"$gpg_error_config_host" != x"$host" ; then | 185 | if test x"$gpg_error_config_host" != x"$host" ; then |
185 | @@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | 186 | @@ -194,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
186 | fi | 187 | fi |
187 | fi | 188 | fi |
188 | else | 189 | else |