Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 1 | From 839f38e5ecc22b7f1b837284bbbffac8cb32ab1e Mon Sep 17 00:00:00 2001 |
Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 3 | Date: Tue, 29 Oct 2019 14:08:32 -0400 |
| 4 | Subject: [PATCH] libgcrypt: fix m4 file for oe-core |
| 5 | |
| 6 | Modify libgcrypt pkgconfig specifically for oe-core. Changes |
| 7 | are based on a previous patch from RP, using wiggle to |
| 8 | incorporate the parts that aren't in the upstream pkgconfig |
| 9 | settings. |
| 10 | |
| 11 | Upstream-Status: Inappropriate [oe-specific] |
| 12 | |
| 13 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 14 | |
| 15 | --- |
| 16 | src/libgcrypt.m4 | 90 +++--------------------------------------------- |
| 17 | 1 file changed, 4 insertions(+), 86 deletions(-) |
| 18 | |
| 19 | diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 20 | index 19d514f..21125c7 100644 |
Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 21 | --- a/src/libgcrypt.m4 |
| 22 | +++ b/src/libgcrypt.m4 |
| 23 | @@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. |
| 24 | dnl |
| 25 | AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 26 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
| 27 | - AC_ARG_WITH(libgcrypt-prefix, |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 28 | - AS_HELP_STRING([--with-libgcrypt-prefix=PFX], |
Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 29 | - [prefix where LIBGCRYPT is installed (optional)]), |
| 30 | - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") |
| 31 | - if test x"${LIBGCRYPT_CONFIG}" = x ; then |
| 32 | - if test x"${libgcrypt_config_prefix}" != x ; then |
| 33 | - LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" |
| 34 | - fi |
| 35 | - fi |
| 36 | - |
| 37 | - use_gpgrt_config="" |
| 38 | - if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
| 39 | - if $GPGRT_CONFIG libgcrypt --exists; then |
| 40 | - LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt" |
| 41 | - AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config]) |
| 42 | - use_gpgrt_config=yes |
| 43 | - fi |
| 44 | - fi |
| 45 | - if test -z "$use_gpgrt_config"; then |
| 46 | - if test x"${LIBGCRYPT_CONFIG}" = x ; then |
| 47 | - case "${SYSROOT}" in |
| 48 | - /*) |
| 49 | - if test -x "${SYSROOT}/bin/libgcrypt-config" ; then |
| 50 | - LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" |
| 51 | - fi |
| 52 | - ;; |
| 53 | - '') |
| 54 | - ;; |
| 55 | - *) |
| 56 | - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
| 57 | - ;; |
| 58 | - esac |
| 59 | - fi |
| 60 | - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| 61 | - fi |
| 62 | |
| 63 | tmp=ifelse([$1], ,1:1.2.0,$1) |
| 64 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
| 65 | @@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 66 | min_libgcrypt_version="$tmp" |
| 67 | fi |
| 68 | |
| 69 | - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) |
| 70 | - ok=no |
| 71 | - if test "$LIBGCRYPT_CONFIG" != "no" ; then |
| 72 | - req_major=`echo $min_libgcrypt_version | \ |
| 73 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
| 74 | - req_minor=`echo $min_libgcrypt_version | \ |
| 75 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| 76 | - req_micro=`echo $min_libgcrypt_version | \ |
| 77 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
| 78 | - if test -z "$use_gpgrt_config"; then |
| 79 | - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` |
| 80 | - else |
| 81 | - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion` |
| 82 | - fi |
| 83 | - major=`echo $libgcrypt_config_version | \ |
| 84 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| 85 | - minor=`echo $libgcrypt_config_version | \ |
| 86 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
| 87 | - micro=`echo $libgcrypt_config_version | \ |
| 88 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
| 89 | - if test "$major" -gt "$req_major"; then |
| 90 | - ok=yes |
| 91 | - else |
| 92 | - if test "$major" -eq "$req_major"; then |
| 93 | - if test "$minor" -gt "$req_minor"; then |
| 94 | - ok=yes |
| 95 | - else |
| 96 | - if test "$minor" -eq "$req_minor"; then |
| 97 | - if test "$micro" -ge "$req_micro"; then |
| 98 | - ok=yes |
| 99 | - fi |
| 100 | - fi |
| 101 | - fi |
| 102 | - fi |
| 103 | - fi |
| 104 | - fi |
| 105 | - if test $ok = yes; then |
| 106 | - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) |
| 107 | - else |
| 108 | - AC_MSG_RESULT(no) |
| 109 | - fi |
| 110 | + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= $min_libgcrypt_version], [ok=yes], [ok=no]) |
| 111 | + |
| 112 | if test $ok = yes; then |
| 113 | # If we have a recent libgcrypt, we should also check that the |
| 114 | # API is compatible |
| 115 | if test "$req_libgcrypt_api" -gt 0 ; then |
| 116 | - if test -z "$use_gpgrt_config"; then |
| 117 | - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` |
| 118 | - else |
| 119 | - tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0` |
| 120 | - fi |
| 121 | + tmp=`$PKG_CONFIG --variable=api_version libgcrypt` |
| 122 | if test "$tmp" -gt 0 ; then |
| 123 | AC_MSG_CHECKING([LIBGCRYPT API version]) |
| 124 | if test "$req_libgcrypt_api" -eq "$tmp" ; then |
| 125 | @@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 126 | fi |
| 127 | fi |
| 128 | if test $ok = yes; then |
| 129 | - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` |
| 130 | - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` |
| 131 | ifelse([$2], , :, [$2]) |
| 132 | if test -z "$use_gpgrt_config"; then |
| 133 | - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` |
| 134 | + libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` |
| 135 | else |
| 136 | libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none` |
| 137 | fi |
| 138 | @@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 139 | fi |
| 140 | fi |
| 141 | else |
| 142 | - LIBGCRYPT_CFLAGS="" |
| 143 | - LIBGCRYPT_LIBS="" |
| 144 | ifelse([$3], , :, [$3]) |
| 145 | fi |
| 146 | AC_SUBST(LIBGCRYPT_CFLAGS) |