From nobody Mon Mar 07 18:27:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 642791A07495; Mon, 7 Mar 2022 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC6Px4mZdz3hBC; Mon, 7 Mar 2022 18:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDrEPHCiq7dIozoBUJgFzOtyBXM/PqGSAxT3w/Zg+UY=; b=RcWlVb+F828F0Eu74P1WLD137YV3fooZ9sCQut05VxZxUUbUuSNyGRpIz3o5goc+f+HZPD ZbwiDdD12iHyKF7M3BkOijHnUNDdKXQwAojxTKQ6ANUb66WHiNQWjMyoEH9uXyBlfqKM6E MJTPbd+cN/4+BZTd1G0yzjufpGzPxgLyhaiJIdL2UcAC05e5M1Uc5YM/NXhVKwCx6qU2io V+PQMkZQq8iLjQfsdQdFTlvDzymh+reSYRQAn1QGwv/XLBbyPa7GwY89NT3tsqY6kLMk6Y duDKBnXoEfNJzmHVwmb5D/R4c0U61jImmeQeuOjYqwFJP1jL93fppkmEjCQ4pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14EC95990; Mon, 7 Mar 2022 18:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227IRW3U086145; Mon, 7 Mar 2022 18:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IRWFd086144; Mon, 7 Mar 2022 18:27:32 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:27:32 GMT Message-Id: <202203071827.227IRWFd086144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fb09dfccc7a6 - main - devel/gaa: Fix build with bison 3.8.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb09dfccc7a67894656655f38db5849e4ea91ac9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDrEPHCiq7dIozoBUJgFzOtyBXM/PqGSAxT3w/Zg+UY=; b=FS+recOwaDocNmnphR30DNXzixcJzLlQ4U+un4KU6mOQSVjLT0vYG47W3P76ntSMwomJgN d3Uya+TrAM6TTrA/BCMdTpibeKzwmhMiSFbcWkXJEhtpict42VTlGs9G6vutv/EoffzhGO XdUSQ8/nO01VZRYNnsTLo6upPVtbgxoq0jStkM+dlgYMraC412swpkPepT8N/LfzGYkpAn KafWp4ImjU3ve2+l3Fg0LVQwu9OqHkXicU9R1rYyGmZiAeqJvLq93/a/DWFY91nSyOw7tc UvJIedLSgD4RwKtZxrh0Lym/LGqYFtMPrnFPpEQyKKBSu3dtTuHjeRvGiX3nWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646677654; a=rsa-sha256; cv=none; b=rizekk6FcR9450+rGQ41ZkomYe0LtGcbqV2bR41r5IGWILskXFZuTXIX9Z8xxlvT3cIWTr LPOXRM6Z1XNt+R2XZLMMlr+v8zQd6Hpi+IKak5JSmx6ZgYGZ48Jk8/dJ+coThdZETLZgMB XSq0LghtLhlUzt4wQmYOEYpSWN/+hCH+iAwf9X+1WY+ceAaCFotGHjVyeap52c7U1gYpor yEUccQxlR3eh//qaHuY/DsTPSohjOu12KUiPlWwZYWExWWVnhFkD7oM0k5TbON8EgfH3Xy 4NmOpPLqreY3S9xX+ZiSHecVgvRadujB5h5PLnruajfLY4aQ/LJEnn8kWhQu2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb09dfccc7a67894656655f38db5849e4ea91ac9 commit fb09dfccc7a67894656655f38db5849e4ea91ac9 Author: Po-Chuan Hsieh AuthorDate: 2022-03-07 18:08:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-07 18:13:22 +0000 devel/gaa: Fix build with bison 3.8.0+ PR: 262252 --- devel/gaa/files/patch-bison | 73 +++++++++++++++++++++++++++++++++++++++++ devel/gaa/files/patch-configure | 8 ++--- 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/devel/gaa/files/patch-bison b/devel/gaa/files/patch-bison new file mode 100644 index 000000000000..bf822d359dfd --- /dev/null +++ b/devel/gaa/files/patch-bison @@ -0,0 +1,73 @@ +--- source/gaa_parser.y.orig 2004-04-15 10:52:42 UTC ++++ source/gaa_parser.y +@@ -22,7 +22,6 @@ + + /* needed in newer bisons for yytoknum. + */ +-#define YYPRINT + #define YYERROR_VERBOSE + + #include +@@ -373,8 +372,6 @@ void copy_str(FILE* fd, int offset, FILE* out, const c + %token AS "as" + %token OPTIONAL "optional" + +-%token_table +- + %% + + input: +@@ -636,6 +633,32 @@ line: + + %% + ++struct token_table_struct { ++ const char *str; ++ int token; ++}; ++ ++static struct token_table_struct token_table[] = { ++ {"IDENTIFIER", IDENTIFIER}, ++ {"ACTION", ACTION}, ++ {"TERMINATE", TERMINATE}, ++ {"CSOURCE", CSOURCE}, ++ {"CPART", CPART}, ++ {"TYPE", TYPE}, ++ {"STRING", STRING}, ++ {"UNDERSCORE_STRINGS", UNDERSCORE_STRINGS}, ++ {"init", INIT}, ++ {"defitem", DEFITEM}, ++ {"option", OPTION}, ++ {"rest", REST}, ++ {"helpnode", HELPNODE}, ++ {"obligat", OBLIGATORY}, ++ {"incomp", INCOMPATIBLE}, ++ {"data", DATA}, ++ {"as", AS}, ++ {"optional", OPTIONAL}, ++}; ++ + extern int loc_index; + + struct _idStruct; +@@ -720,17 +743,9 @@ int length(char *a) + + int getTokenNum( char* str) { + int i; +- for (i = 0; i < YYNTOKENS; i++) +- { +- if (yytname[i] != 0 +- && yytname[i][0] == '"' +- && strncasecmp (yytname[i] + 1, str, strlen (str)) == 0 +- && yytname[i][strlen (str) + 1] == '"' +- && yytname[i][strlen (str) + 2] == 0) +- { +- return yytoknum[i]; +- } +- } ++ for (i = 0; i < (sizeof(token_table)/sizeof(token_table[0])); i++) ++ if (!strcmp (token_table[i].str, str)) ++ return token_table[i].token; + return -1; + } + diff --git a/devel/gaa/files/patch-configure b/devel/gaa/files/patch-configure index e78a9b95b650..6a0567bc53e4 100644 --- a/devel/gaa/files/patch-configure +++ b/devel/gaa/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu May 3 12:06:58 2007 -+++ configure Thu May 3 12:07:01 2007 -@@ -1265,7 +1265,7 @@ +--- configure.orig 2004-07-20 09:30:46 UTC ++++ configure +@@ -1265,7 +1265,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu gaadatadir=$datadir/gaa gaadocdir=$datadir/doc/gaa @@ -9,7 +9,7 @@ -@@ -2888,7 +2888,7 @@ +@@ -2888,7 +2888,7 @@ fi if test $ac_cv_c_compiler_gnu != no; then