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 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index aea8eba5fa..ff15759309 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 62651c5c7b4a391f16dbe1b09c6e220efe5c8a35 Mon Sep 17 00:00:00 2001 | 1 | From 52aae746760ce5b88e61ce994f5055e4ce809821 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 | 159 +---------------------------------------------- | 17 | src/gpg-error.m4 | 160 +---------------------------------------------- |
18 | 1 file changed, 3 insertions(+), 156 deletions(-) | 18 | 1 file changed, 3 insertions(+), 157 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 d910754..76f045c 100644 | 21 | index 56a5d07..28920ae 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,156 +27,12 @@ dnl is added to the gpg_config_script_warn variable. | 24 | @@ -27,157 +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]) |
@@ -63,7 +63,7 @@ index d910754..76f045c 100644 | |||
63 | - min_gpg_error_version=ifelse([$1], ,1.33,$1) | 63 | - min_gpg_error_version=ifelse([$1], ,1.33,$1) |
64 | - ok=no | 64 | - ok=no |
65 | - | 65 | - |
66 | - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) | 66 | - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) |
67 | - if test "$GPGRT_CONFIG" != "no"; then | 67 | - if test "$GPGRT_CONFIG" != "no"; then |
68 | - # Determine gpgrt_libdir | 68 | - # Determine gpgrt_libdir |
69 | - # | 69 | - # |
@@ -78,7 +78,8 @@ index d910754..76f045c 100644 | |||
78 | - # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 | 78 | - # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 |
79 | - # It is assumed that CC is specified to the one of host on cross build. | 79 | - # It is assumed that CC is specified to the one of host on cross build. |
80 | - if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ | 80 | - if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ |
81 | - sed -n -e "/^libraries/{s/libraries: =//;s/:/\n/gp}"); then | 81 | - sed -n -e "/^libraries/{s/libraries: =//;s/:/\\ |
82 | -/g;p;}"); then | ||
82 | - # From the output of -print-search-dirs, select valid pkgconfig dirs. | 83 | - # From the output of -print-search-dirs, select valid pkgconfig dirs. |
83 | - libdir_candidates=$(for dir in $libdir_candidates; do | 84 | - libdir_candidates=$(for dir in $libdir_candidates; do |
84 | - if p=$(cd $dir 2>/dev/null && pwd); then | 85 | - if p=$(cd $dir 2>/dev/null && pwd); then |
@@ -181,7 +182,7 @@ index d910754..76f045c 100644 | |||
181 | fi | 182 | fi |
182 | if test x"$gpg_error_config_host" != xnone ; then | 183 | if test x"$gpg_error_config_host" != xnone ; then |
183 | if test x"$gpg_error_config_host" != x"$host" ; then | 184 | if test x"$gpg_error_config_host" != x"$host" ; then |
184 | @@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | 185 | @@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
185 | fi | 186 | fi |
186 | fi | 187 | fi |
187 | else | 188 | else |