From nobody Sun Jun 11 19:16:39 2023 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 4QfPgr1gy7z4cXG5; Sun, 11 Jun 2023 19:16:40 +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 4QfPgr12K9z4Nnx; Sun, 11 Jun 2023 19:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686511000; 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=8s7MzfiZxdZKeRybbnKvwwJXqxOjyDfBybJ9nMTOd4M=; b=TOXhCEUVdfEo+GmztsFuspi2WSqWAKEoyCn9s57dexgCEIbN+Zh/bV5YZPQjcy0qSu0jQe PtLUnq46xdWndNsDgx4ptVN5tcV+xIr7vjAU/1mV6fwizr1rmdMavZeXDiTY71gpmWKnGZ f5A3o8hA6sTQwlgTOLaUoP6gUV7BG1LVjfDH+2AY2OHY04eHAGWUYr3F5ob5Za4fBSgB9F ImVRmobEqMfarLwXmWZj8QXHWz063btLZslg0xFiAgzTljs3iY6bWEZNy0njLUwsoibzuQ nYU26epzmHQ/WzldQumIreGTXxTVb/I0EyyZMgrEKFx3QqWHDCrFE/V5iAqjfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686511000; 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=8s7MzfiZxdZKeRybbnKvwwJXqxOjyDfBybJ9nMTOd4M=; b=f673bkJ0K9dEZ16Vf2r/8FrUngLkegz+CIVB+txLScXefo1skmMvfopKJRciOIsmZVGhgY IKbmj10081JySg+PK0cFqTqTWtEfJShKs8ijh0yT6/sWFNoxRnF3m9/xkyTLnTCzChr4Zp S0IbDcQ39AUUq6OEsz/zwjeArPXnmlS5+gd1qJyRjSX7vud3mCpguBNPlYQo3ompItWxPo SRwpOIau0jUrXc3+FlhPbfpfFUulStjPo9IvMyQ9W0yJNZlN9VPEIakOZxEEQVaf5x+WHK jn+0WxCjN2gOCU2DlD/iltF4X4FQ3Yz+vgHcsHx5WBkmqQ7cmGgUnmi/rRMm0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686511000; a=rsa-sha256; cv=none; b=O2m+G2KRqJxSEo2jg6EzSwEyrJmSBGshF3fBhU29ZUZ7cK1h7yJsglURfzp28d+7/WGcnF zyFq3CiAH0bKPqYKmeGZAxcdNZBwtNi8P9gLfgo7qK62/DfY93ImVpRBgDCkPJnIV/I/QQ TocaR6A7UjT2cOBNYoZX6N9vA3L1oftW+CNs58x/fSdt9dXv2VJdbp4mbBxf/tixy3w42o QSPUIXNKzhZ3zbH2cuOSeNBtxuq1CVs7P0nl26XD7MIOvRno2FQLS0pnMFLrOxTphjKW6g 6rEKt+ZePPG4qe2roSIRkKDRmKEH1xcxWkdhSPKskcugi+fIIqp+0TfjI2iByQ== 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 4QfPgr07DGz19Gg; Sun, 11 Jun 2023 19:16:40 +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 35BJGdIn052630; Sun, 11 Jun 2023 19:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BJGdqw052629; Sun, 11 Jun 2023 19:16:39 GMT (envelope-from git) Date: Sun, 11 Jun 2023 19:16:39 GMT Message-Id: <202306111916.35BJGdqw052629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 77f8df9a0d07 - main - misc/tlci: Fix build with llvm15 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77f8df9a0d07f9ca47461eb806a5c3e689830a76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=77f8df9a0d07f9ca47461eb806a5c3e689830a76 commit 77f8df9a0d07f9ca47461eb806a5c3e689830a76 Author: Muhammad Moinur Rahman AuthorDate: 2023-06-11 19:14:30 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-11 19:16:23 +0000 misc/tlci: Fix build with llvm15 Approved by: portmgr (blanket) --- misc/tlci/Makefile | 8 ++++++++ misc/tlci/files/patch-src_evaluator.c | 11 +++++++++++ misc/tlci/files/patch-src_heap.c | 11 +++++++++++ misc/tlci/files/patch-src_lexer.l | 20 ++++++++++++++++++++ misc/tlci/files/patch-src_parser.y | 11 +++++++++++ misc/tlci/files/patch-src_tlci.c | 11 +++++++++++ 6 files changed, 72 insertions(+) diff --git a/misc/tlci/Makefile b/misc/tlci/Makefile index 0bc1c9cfc831..1340aee2bd5b 100644 --- a/misc/tlci/Makefile +++ b/misc/tlci/Makefile @@ -16,6 +16,14 @@ GL_COMMIT= 4a3dd51a872f36a513f06efa475922259dee91f1 PLIST_FILES= ${PREFIX}/bin/tlci \ ${PREFIX}/man/man8/tlci.8.gz +.include + +#post-patch: +#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +# @${REINPLACE_CMD} -e 's|^CFLAGS\+=|CFLAGS\+= -Wno-error=strict-prototypes |g' \ +# ${WRKSRC}/Makefile +#.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tlci diff --git a/misc/tlci/files/patch-src_evaluator.c b/misc/tlci/files/patch-src_evaluator.c new file mode 100644 index 000000000000..c0202811ea10 --- /dev/null +++ b/misc/tlci/files/patch-src_evaluator.c @@ -0,0 +1,11 @@ +--- src/evaluator.c.orig 2023-06-11 19:02:44 UTC ++++ src/evaluator.c +@@ -192,7 +192,7 @@ void eval_init(jmp_buf* error_handler) + memcpy(&on_error, error_handler, sizeof(jmp_buf)); + } + /*********************************************************************************/ +-string eval_get_error() ++string eval_get_error(void) + { + return (string) { .begin = error_msg, .len = strlen(error_msg) }; + } diff --git a/misc/tlci/files/patch-src_heap.c b/misc/tlci/files/patch-src_heap.c new file mode 100644 index 000000000000..de1243385cfb --- /dev/null +++ b/misc/tlci/files/patch-src_heap.c @@ -0,0 +1,11 @@ +--- src/heap.c.orig 2023-06-11 18:59:24 UTC ++++ src/heap.c +@@ -34,7 +34,7 @@ + static heap_cell_t* pool_alloc(heap_t*); + static void pool_swipe(heap_t*); + /******************************************************************************/ +-heap_t* heap_create() ++heap_t* heap_create(void) + { + heap_t* heap = calloc(1, sizeof(heap_t)); + if (!heap) { diff --git a/misc/tlci/files/patch-src_lexer.l b/misc/tlci/files/patch-src_lexer.l new file mode 100644 index 000000000000..5abf330cec13 --- /dev/null +++ b/misc/tlci/files/patch-src_lexer.l @@ -0,0 +1,20 @@ +--- src/lexer.l.orig 2023-06-11 19:08:30 UTC ++++ src/lexer.l +@@ -49,7 +49,7 @@ void reset_lexer(void) + YY_FLUSH_BUFFER; + } + /*********************************************************************************/ +-heap_cell_t* get_token_pos() ++heap_cell_t* get_token_pos(void) + { + return heap_alloc_token_pos(tlci_heap, + from_cstring(string_dup(filename)), +@@ -61,7 +61,7 @@ void yyerror(char *s) + printf("%s:%d:%d: \033[31m%s:\033[0m Unexpected '%s'\n", filename, yylineno, tokenpos, s, yytext); + } + /*********************************************************************************/ +-void switch_to_stdin() ++void switch_to_stdin(void) + { + filename = ""; + yyin = stdin; diff --git a/misc/tlci/files/patch-src_parser.y b/misc/tlci/files/patch-src_parser.y new file mode 100644 index 000000000000..f1418faed9f7 --- /dev/null +++ b/misc/tlci/files/patch-src_parser.y @@ -0,0 +1,11 @@ +--- src/parser.y.orig 2023-06-11 19:00:49 UTC ++++ src/parser.y +@@ -4,7 +4,7 @@ + #include + #include + extern heap_t* tlci_heap; +-extern int yylex(); ++extern int yylex(void); + extern void yyerror(const char*); + #define mkAP(f, a) \ + heap_alloc_ap(tlci_heap, f, a) diff --git a/misc/tlci/files/patch-src_tlci.c b/misc/tlci/files/patch-src_tlci.c new file mode 100644 index 000000000000..c458d4472e54 --- /dev/null +++ b/misc/tlci/files/patch-src_tlci.c @@ -0,0 +1,11 @@ +--- src/tlci.c.orig 2023-06-11 19:01:46 UTC ++++ src/tlci.c +@@ -46,7 +46,7 @@ extern void switch_to_stdin(void); + extern FILE* yyin; + + /*********************************************************************************/ +-static void on_quit() ++static void on_quit(void) + { + heap_destroy(tlci_heap); + }