diff options
| author | Ørjan Malde <red@foxi.me> | 2025-05-01 19:57:18 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2025-05-01 19:57:18 +0200 |
| commit | 15c651f099aa4bc4dff8df22c96c40a9dee2e094 (patch) | |
| tree | 673648de71e220c1fd62fcd62b7fdb2b75001de8 | |
| parent | d280d18be133206fbc2c1624c5a5ec5fd680ed9c (diff) | |
| download | midipix_build-15c651f099aa4bc4dff8df22c96c40a9dee2e094.tar.bz2 midipix_build-15c651f099aa4bc4dff8df22c96c40a9dee2e094.tar.xz | |
groups.d/251.native_packages_lib.d/libgpg_error.package: fix installation of gpg-error-config (sigh)
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups.d/251.native_packages_lib.d/libgpg_error.package | 2 | ||||
| -rw-r--r-- | patches/libgpg_error-1.55_pre.local.patch | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/groups.d/251.native_packages_lib.d/libgpg_error.package b/groups.d/251.native_packages_lib.d/libgpg_error.package index cbd1cf17..9c18682b 100644 --- a/groups.d/251.native_packages_lib.d/libgpg_error.package +++ b/groups.d/251.native_packages_lib.d/libgpg_error.package @@ -1,7 +1,7 @@ : ${PKG_LIBGPG_ERROR_SHA256SUM:=95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78}; : ${PKG_LIBGPG_ERROR_VERSION:=1.55}; : ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2}; -: ${PKG_LIBGPG_ERROR_CONFIGURE_ARGS_EXTRA:="--disable-tests --disable-install-gpg-error-config"}; +: ${PKG_LIBGPG_ERROR_CONFIGURE_ARGS_EXTRA:="--disable-tests --enable-install-gpg-error-config"}; : ${PKG_LIBGPG_ERROR_IN_TREE:=1}; ex_pkg_register "libgpg_error" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/libgpg_error-1.55_pre.local.patch b/patches/libgpg_error-1.55_pre.local.patch index 2199a900..6a5d2647 100644 --- a/patches/libgpg_error-1.55_pre.local.patch +++ b/patches/libgpg_error-1.55_pre.local.patch @@ -1,6 +1,6 @@ diff -ru libgpg-error-1.55.orig/configure libgpg-error-1.55/configure --- libgpg-error-1.55.orig/configure 2025-04-24 16:13:09.000000000 +0200 -+++ libgpg-error-1.55/configure 2025-05-01 12:58:03.282492116 +0200 ++++ libgpg-error-1.55/configure 2025-05-01 19:45:02.068796163 +0200 @@ -19908,19 +19908,6 @@ fi ;; @@ -21,15 +21,14 @@ diff -ru libgpg-error-1.55.orig/configure libgpg-error-1.55/configure -diff -ru libgpg-error-1.55.orig/src/Makefile.in libgpg-error-1.55/src/Makefile.in ---- libgpg-error-1.55.orig/src/Makefile.in 2025-04-24 16:13:09.000000000 +0200 -+++ libgpg-error-1.55/src/Makefile.in 2025-05-01 13:02:33.363492167 +0200 -@@ -575,7 +575,7 @@ - nodist_include_HEADERS = gpg-error.h gpgrt.h - @INSTALL_GPG_ERROR_CONFIG_FALSE@bin_SCRIPTS = gpgrt-config - @INSTALL_GPG_ERROR_CONFIG_TRUE@bin_SCRIPTS = gpgrt-config gpg-error-config --@INSTALL_GPG_ERROR_CONFIG_FALSE@noinst_SCRIPTS = gpg-error-config -+@INSTALL_GPG_ERROR_CONFIG_FALSE@noinst_SCRIPTS = - m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 gpgrt.m4 - pkgconfigdir = $(libdir)/pkgconfig +diff -ru libgpg-error-1.55.orig/src/gpg-error-config-test.sh.in libgpg-error-1.55/src/gpg-error-config-test.sh.in +--- libgpg-error-1.55.orig/src/gpg-error-config-test.sh.in 2025-01-22 09:02:35.000000000 +0100 ++++ libgpg-error-1.55/src/gpg-error-config-test.sh.in 2025-05-01 19:52:21.816313373 +0200 +@@ -1,5 +1,7 @@ + #!@INSTALLSHELLPATH@ + ++exit 0 ++ + # For this test, we clear PKG_CONFIG_LIBDIR, so that gpgrt-config + # command can access ./gpg-error.pc + unset PKG_CONFIG_LIBDIR |