Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 573842 Details for
Bug 683254
dev-libs/libgpg-error-1.32-r1 with gawk-5: fatal: cannot use gawk builtin `namespace' as variable name
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
version bump with gawk-5 upstream path version 2
0001-dev-libs-libgpg-error-version-bump-along-with-gawk-5.patch (text/plain), 8.50 KB, created by
Jory A. Pratt
on 2019-04-22 21:53:38 UTC
(
hide
)
Description:
version bump with gawk-5 upstream path version 2
Filename:
MIME Type:
Creator:
Jory A. Pratt
Created:
2019-04-22 21:53:38 UTC
Size:
8.50 KB
patch
obsolete
>From 7380bd7a966e45a203e1e2c547c79cfa1971c47c Mon Sep 17 00:00:00 2001 >From: Jory Pratt <anarchy@gentoo.org> >Date: Mon, 22 Apr 2019 16:50:23 -0500 >Subject: [PATCH] dev-libs/libgpg-error: version bump along with gawk-5 > upstream fix > >Package-Manager: Portage-2.3.64, Repoman-2.3.12 >Signed-off-by: Jory Pratt <anarchy@gentoo.org> >--- > dev-libs/libgpg-error/Manifest | 1 + > .../libgpg-error-1.36-gawk5-support.patch | 158 ++++++++++++++++++ > .../libgpg-error/libgpg-error-1.36.ebuild | 50 ++++++ > 3 files changed, 209 insertions(+) > create mode 100644 dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch > create mode 100644 dev-libs/libgpg-error/libgpg-error-1.36.ebuild > >diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest >index 7430b415e..c509b3989 100644 >--- a/dev-libs/libgpg-error/Manifest >+++ b/dev-libs/libgpg-error/Manifest >@@ -1,3 +1,4 @@ > DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f > DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b > DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20 >+DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 >diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch >new file mode 100644 >index 000000000..17e881645 >--- /dev/null >+++ b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch >@@ -0,0 +1,158 @@ >+From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 >+From: NIIBE Yutaka <gniibe@fsij.org> >+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 <gniibe@fsij.org> >+--- >+ 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 >+ >diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild >new file mode 100644 >index 000000000..09638216f >--- /dev/null >+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild >@@ -0,0 +1,50 @@ >+# Copyright 1999-2019 Gentoo Authors >+# Distributed under the terms of the GNU General Public License v2 >+ >+EAPI=7 >+ >+inherit autotools libtool multilib-minimal toolchain-funcs >+ >+DESCRIPTION="Contains error handling functions used by GnuPG software" >+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error" >+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" >+ >+LICENSE="GPL-2 LGPL-2.1" >+SLOT="0" >+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" >+IUSE="common-lisp nls static-libs" >+ >+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" >+DEPEND="${RDEPEND}" >+BDEPEND="nls? ( sys-devel/gettext )" >+ >+MULTILIB_CHOST_TOOLS=( >+ /usr/bin/gpg-error-config >+) >+MULTILIB_WRAPPED_HEADERS=( >+ /usr/include/gpg-error.h >+ /usr/include/gpgrt.h >+) >+ >+PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" ) >+ >+src_prepare() { >+ default >+ eautoreconf >+} >+ >+multilib_src_configure() { >+ ECONF_SOURCE="${S}" econf \ >+ $(multilib_is_native_abi || echo --disable-languages) \ >+ $(use_enable common-lisp languages) \ >+ $(use_enable nls) \ >+ $(use_enable static-libs static) \ >+ --enable-threads \ >+ CC_FOR_BUILD="$(tc-getBUILD_CC)" \ >+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') >+} >+ >+multilib_src_install_all() { >+ einstalldocs >+ find "${D}" -name '*.la' -delete || die >+} >-- >2.21.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 683254
:
572680
|
573002
|
573756
|
573760
| 573842