From ee56266c8052dcc4530ceee2de3f2e8e51c065ad Mon Sep 17 00:00:00 2001 From: Matheus Date: Thu, 20 Aug 2026 17:12:27 -0300 Subject: [PATCH] libgpg-error: autogenerate lock --- patches/libgpg-error/jinx-working-patch.patch | 44 ++++++------------- recipes/libgcrypt | 2 +- recipes/libgpg-error | 2 +- 3 files changed, 15 insertions(+), 33 deletions(-) diff --git a/patches/libgpg-error/jinx-working-patch.patch b/patches/libgpg-error/jinx-working-patch.patch index 764a1fe1..fd3fb4b6 100644 --- a/patches/libgpg-error/jinx-working-patch.patch +++ b/patches/libgpg-error/jinx-working-patch.patch @@ -1,31 +1,13 @@ -diff --git libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h -new file mode 100644 -index 0000000..0dd6431 ---- /dev/null -+++ libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.x86_64-pc-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## +diff --git libgpg-error-clean/configure.ac libgpg-error-workdir/configure.ac +index e8a8b6d8..263b75d9 100644 +--- libgpg-error-clean/configure.ac ++++ libgpg-error-workdir/configure.ac +@@ -604,7 +604,7 @@ if test x"$gl_use_threads" = xno; then + AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host]) + elif test x$cross_compiling = xyes; then + case $host in +- *-*-linux-gnu* | *-*-linux-musl*) ++ *-*-linux-gnu* | *-*-linux-musl* | *-*-astral*) + AC_CHECK_TOOL(OBJDUMP, [objdump]) + if test -n "$OBJDUMP"; then + lock_obj_h_generated=yes diff --git a/recipes/libgcrypt b/recipes/libgcrypt index 97d2ebdc..274a4b6c 100644 --- a/recipes/libgcrypt +++ b/recipes/libgcrypt @@ -1,5 +1,5 @@ name=libgcrypt -revision=2 +revision=3 from_source=libgcrypt imagedeps="meson ninja-build gcc build-essential" hostdeps="xgcc xbinutils pkgconfig libtool" diff --git a/recipes/libgpg-error b/recipes/libgpg-error index 0bed7001..7dd64b90 100644 --- a/recipes/libgpg-error +++ b/recipes/libgpg-error @@ -1,5 +1,5 @@ name=libgpg-error -revision=2 +revision=3 from_source=libgpg-error imagedeps="gcc build-essential" hostdeps="xgcc xbinutils pkgconfig libtool"