diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2024-04-24 02:19:41 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2024-04-24 05:52:54 +0000 |
| commit | 08015d126ec3355915e59dd14322e11df1db03de (patch) | |
| tree | 3e2054b3904862dcc5a9c0beb12948841f68af87 | |
| parent | 2dcb064c7a674df5de393fcd37dfaeb6f8e7e0a4 (diff) | |
| download | ports-08015d126ec3355915e59dd14322e11df1db03de.tar.gz ports-08015d126ec3355915e59dd14322e11df1db03de.zip | |
security/gpgme: Use gpgrt-config for configure
Prefer gpgrt-config in the configure stage over the old individual
*-config scripts from the various gnupg-related libraries.
| -rw-r--r-- | security/gpgme/files/patch-configure | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure index c459227ace77..9884bbddbdc4 100644 --- a/security/gpgme/files/patch-configure +++ b/security/gpgme/files/patch-configure @@ -1,12 +1,16 @@ +Hunk 1: The configure script automatically detects all versions of Python and builds the bindings for each found version. This is a problem when building outside of a clean environment since the ports system can only build a package for one Python flavor at a time. The found versions of Python are overridden by environment variables set in the port Makefile. ---- configure.orig 2023-08-21 07:46:33 UTC +Hunk 2: +Fix path of pkgconfig files passed to gpgrt-config. + +--- configure.orig 2023-11-28 15:45:04 UTC +++ configure -@@ -31342,6 +31342,10 @@ printf "%s\n" "$as_me: WARNING: +@@ -31428,6 +31428,10 @@ printf "%s\n" "$as_me: WARNING: fi @@ -17,3 +21,12 @@ environment variables set in the port Makefile. # Recover some values lost in the second attempt to find Python. PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)" PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)" +@@ -32691,7 +32695,7 @@ fi + # Get the prefix of gpgrt-config assuming it's something like: + # <PREFIX>/bin/gpgrt-config + gpgrt_prefix=${GPGRT_CONFIG%/*/*} +- possible_libdir1=${gpgrt_prefix}/lib ++ possible_libdir1=${gpgrt_prefix}/libdata + # Determine by using system libdir-format with CC, it's like: + # Normal style: /usr/lib + # GNU cross style: /usr/<triplet>/lib |