From 59909a06919b22200d03b4eabba3984d73e00d94 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 9 Mar 2022 19:31:10 +0100 Subject: [PATCH] dev-util/re2c: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/dev-util/re2c/Manifest | 3 +- .../dev-util/re2c/files/re2c-2.1.1-sh.patch | 48 +++++++++++++++++++ .../portage-stable/dev-util/re2c/metadata.xml | 5 +- ...re2c-2.0.3.ebuild => re2c-2.1.1-r1.ebuild} | 18 ++++++- .../dev-util/re2c/re2c-2.2.ebuild | 40 ++++++++++++++++ 5 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch rename sdk_container/src/third_party/portage-stable/dev-util/re2c/{re2c-2.0.3.ebuild => re2c-2.1.1-r1.ebuild} (56%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest index 59708a0ee9..705c45b9de 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest @@ -1 +1,2 @@ -DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c +DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae +DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch b/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch new file mode 100644 index 0000000000..7caa5d7d1a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/files/re2c-2.1.1-sh.patch @@ -0,0 +1,48 @@ +Matt noticed errors when running ./configure on dash: + ./configure: 5339: test: x: unexpected operator + ./configure: 5386: test: x: unexpected operator + +The change is to use POSIX '=' comparison instead of bash-specific ==. + +Patch-by: Matt Whitlock +https://bugs.gentoo.org/779187 +--- a/configure.ac 2021-03-27 18:25:24.000000000 +0000 ++++ b/configure.ac 2021-03-30 01:34:01.993467424 +0000 +@@ -65,7 +65,7 @@ + # --enable-benchmarks + AC_ARG_ENABLE([benchmarks], [AS_HELP_STRING([--enable-benchmarks], + [build benchmarks])]) +-AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" == "xyes"]) ++AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) + AM_COND_IF([WITH_BENCHMARKS], [ + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([benchmark/benchmark.h], [], +@@ -79,7 +79,7 @@ + [AS_HELP_STRING([--enable-benchmarks-regenerate], + [regenerate C code for benchmarks])]) + AM_CONDITIONAL([REGEN_BENCHMARKS], +- [test "x$enable_benchmarks_regenerate" == "xyes"]) ++ [test "x$enable_benchmarks_regenerate" = "xyes"]) + + + # checks for programs +--- a/configure ++++ b/configure +@@ -5336,7 +5336,7 @@ if test "${enable_benchmarks+set}" = set; then : + enableval=$enable_benchmarks; + fi + +- if test "x$enable_benchmarks" == "xyes"; then ++ if test "x$enable_benchmarks" = "xyes"; then + WITH_BENCHMARKS_TRUE= + WITH_BENCHMARKS_FALSE='#' + else +@@ -5383,7 +5383,7 @@ if test "${enable_benchmarks_regenerate+set}" = set; then : + enableval=$enable_benchmarks_regenerate; + fi + +- if test "x$enable_benchmarks_regenerate" == "xyes"; then ++ if test "x$enable_benchmarks_regenerate" = "xyes"; then + REGEN_BENCHMARKS_TRUE= + REGEN_BENCHMARKS_FALSE='#' + else diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml index 0093ef8412..24c01d112f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml @@ -1,12 +1,9 @@ - + robbat2@gentoo.org - - slyfox@gentoo.org - re2c skvadrik/re2c diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild index aba4c616a4..854354f082 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild @@ -1,17 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="tool for generating C-based recognizers from regular expressions" HOMEPAGE="http://re2c.org/" SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug" +PATCHES=("${FILESDIR}"/${P}-sh.patch) + +src_prepare() { + default + + # Only needed for the sh patch + # Despite the patch modifying the configure directly, + # this is sometimes fragile and triggers maintainer mode anyway. + # bug #779187 + eautoreconf +} + src_configure() { econf \ --enable-golang \ diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild new file mode 100644 index 0000000000..2c4d64c193 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit autotools python-any-r1 + +DESCRIPTION="tool for generating C-based recognizers from regular expressions" +HOMEPAGE="http://re2c.org/" +SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug test" + +RESTRICT="!test? ( test )" + +# python is used only as a test driver +BDEPEND="test? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + econf \ + --enable-golang \ + ac_cv_path_BISON="no" \ + $(use_enable debug) +} + +src_install() { + default + + docompress -x /usr/share/doc/${PF}/examples + dodoc -r README.md CHANGELOG examples +}