diff options
| -rw-r--r-- | meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch | 27 | ||||
| -rw-r--r-- | meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb | 3 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch new file mode 100644 index 0000000000..146501c775 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From f8f4e1a617c4610ea7dc40a60f1c696ebc37850c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 2 Apr 2023 09:27:42 -0700 | ||
| 4 | Subject: [PATCH] Use pkg-config to find gpgme | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [OE specific] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | m4/gpgme.m4 | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 | ||
| 13 | index 44bf43c..c9a8ae6 100644 | ||
| 14 | --- a/m4/gpgme.m4 | ||
| 15 | +++ b/m4/gpgme.m4 | ||
| 16 | @@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], | ||
| 17 | if test "x$gpgme_config_prefix" != x ; then | ||
| 18 | GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" | ||
| 19 | fi | ||
| 20 | - AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) | ||
| 21 | + GPGME_CONFIG="pkg-config gpgme" | ||
| 22 | |||
| 23 | if test "$GPGME_CONFIG" != "no" ; then | ||
| 24 | gpgme_version=`$GPGME_CONFIG --version` | ||
| 25 | -- | ||
| 26 | 2.40.0 | ||
| 27 | |||
diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index a35ec06795..d3753217c7 100644 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb | |||
| @@ -3,10 +3,11 @@ HOMEPAGE = "http://www.cipherdyne.org/fwknop/" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
| 5 | " | 5 | " |
| 6 | inherit autotools-brokensep | 6 | inherit autotools-brokensep pkgconfig |
| 7 | 7 | ||
| 8 | SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ | 8 | SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ |
| 9 | file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ | 9 | file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ |
| 10 | file://0001-Use-pkg-config-to-find-gpgme.patch \ | ||
| 10 | " | 11 | " |
| 11 | SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" | 12 | SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" |
| 12 | SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" | 13 | SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" |
