From dfbf746e7aa48e37b1a8656815bc583e81adb22a Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Thu, 13 Jan 2022 14:14:23 -0500 Subject: [PATCH] libgpg-error : Bump to 1.42 Fixes cross-compilation issues among other things. --- package/libs/libgpg-error/Makefile | 26 ++- .../patches/010-add-arc-support.patch | 7 - .../patches/020-build-fix-generation.patch | 27 +++ .../patches/020-gawk5-support.patch | 158 ------------------ 4 files changed, 48 insertions(+), 170 deletions(-) create mode 100644 package/libs/libgpg-error/patches/020-build-fix-generation.patch delete mode 100644 package/libs/libgpg-error/patches/020-gawk5-support.patch diff --git a/package/libs/libgpg-error/Makefile b/package/libs/libgpg-error/Makefile index 8a18cd18a3..efe12ce805 100644 --- a/package/libs/libgpg-error/Makefile +++ b/package/libs/libgpg-error/Makefile @@ -8,22 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpg-error -PKG_VERSION:=1.36 -PKG_RELEASE:=3 +PKG_VERSION:=1.42 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \ http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \ https://www.gnupg.org/ftp/gcrypt/libgpg-error -PKG_HASH:=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c +PKG_HASH:=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -60,11 +60,23 @@ define Build/InstallDev $(2)/bin/gpg-error-config ln -sf $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/gpgrt-config \ + $(2)/bin/ + $(SED) \ + 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ + $(2)/bin/gpgrt-config + ln -sf $(STAGING_DIR)/host/bin/gpgrt-config $(1)/usr/bin/gpgrt-config + $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/include/gpg-error.h \ $(1)/usr/include/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/gpgrt.h \ + $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{la,a,so*} \ @@ -74,6 +86,10 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 \ $(1)/usr/share/aclocal/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/aclocal/gpgrt.m4 \ + $(1)/usr/share/aclocal/ endef define Package/libgpg-error/install diff --git a/package/libs/libgpg-error/patches/010-add-arc-support.patch b/package/libs/libgpg-error/patches/010-add-arc-support.patch index 1020c7e397..5ecf81c292 100644 --- a/package/libs/libgpg-error/patches/010-add-arc-support.patch +++ b/package/libs/libgpg-error/patches/010-add-arc-support.patch @@ -26,8 +26,6 @@ Signed-off-by: Alexey Brodkin 2 files changed, 24 insertions(+) create mode 100644 src/syscfg/lock-obj-pub.arc-unknown-linux-gnu.h -diff --git a/src/Makefile.am b/src/Makefile.am -index 380ea7c09c04..bd00961c2f27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ lock_obj_pub = \ @@ -38,9 +36,6 @@ index 380ea7c09c04..bd00961c2f27 100644 syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h \ syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h \ syscfg/lock-obj-pub.arm-apple-darwin.h \ -diff --git a/src/syscfg/lock-obj-pub.arc-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.arc-unknown-linux-gnu.h -new file mode 100644 -index 000000000000..3b1a8fadf8a7 --- /dev/null +++ b/src/syscfg/lock-obj-pub.arc-unknown-linux-gnu.h @@ -0,0 +1,23 @@ @@ -67,5 +62,3 @@ index 000000000000..3b1a8fadf8a7 +## buffer-read-only: t +## End: +## --- -2.17.1 diff --git a/package/libs/libgpg-error/patches/020-build-fix-generation.patch b/package/libs/libgpg-error/patches/020-build-fix-generation.patch new file mode 100644 index 0000000000..ddbf02ca26 --- /dev/null +++ b/package/libs/libgpg-error/patches/020-build-fix-generation.patch @@ -0,0 +1,27 @@ +From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Fri, 26 Mar 2021 16:06:50 +0900 +Subject: [PATCH 1/2] build: Fix generation of lock-obj-pub.native.h for cross + build. + +* src/gen-lock-obj.sh: Capture echo output with quotes. + +-- + +Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 +Signed-off-by: David Michael +--- + src/gen-lock-obj.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/gen-lock-obj.sh ++++ b/src/gen-lock-obj.sh +@@ -38,7 +38,7 @@ + # AWK=gawk ./gen-lock-obj.sh + # + +-if test -n `echo -n`; then ++if test -n "`echo -n`"; then + ECHO_C='\c' + ECHO_N='' + else diff --git a/package/libs/libgpg-error/patches/020-gawk5-support.patch b/package/libs/libgpg-error/patches/020-gawk5-support.patch deleted file mode 100644 index 17e8816453..0000000000 --- a/package/libs/libgpg-error/patches/020-gawk5-support.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - --- -2.21.0 - -- 2.25.1