From owner-dev-commits-ports-all@freebsd.org Wed Jul 21 08:09:03 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D82965D625; Wed, 21 Jul 2021 08:09:03 +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 4GV7Wz0yk8z4Zlm; Wed, 21 Jul 2021 08:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 09FA61A5CE; Wed, 21 Jul 2021 08:09:03 +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 16L892eT022393; Wed, 21 Jul 2021 08:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16L892dC022392; Wed, 21 Jul 2021 08:09:02 GMT (envelope-from git) Date: Wed, 21 Jul 2021 08:09:02 GMT Message-Id: <202107210809.16L892dC022392@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f11e9f154140 - main - lang/spl: patch and unbreak with -fno-common MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f11e9f154140bf1d042a9f7fce069e21c3eda2b7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 08:09:03 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f11e9f154140bf1d042a9f7fce069e21c3eda2b7 commit f11e9f154140bf1d042a9f7fce069e21c3eda2b7 Author: Robert Clausecker AuthorDate: 2021-07-20 09:42:55 +0000 Commit: Li-Wen Hsu CommitDate: 2021-07-21 08:07:47 +0000 lang/spl: patch and unbreak with -fno-common PR: 257295 --- lang/spl/Makefile | 11 ++++------- lang/spl/files/patch-libspl.c | 10 ++++++++++ lang/spl/files/patch-spl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/lang/spl/Makefile b/lang/spl/Makefile index 7daa1e332505..3e8c808784a4 100644 --- a/lang/spl/Makefile +++ b/lang/spl/Makefile @@ -2,26 +2,23 @@ PORTNAME= spl PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= http://shakespearelang.sourceforge.net/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Shakespeare programming language LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: cast -BROKEN_FreeBSD_14= ld: error: duplicate symbol: cast - USES= bison gmake +OPTIONS_DEFINE= EXAMPLES + ALL_EXAMPLES= Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \ primes.spl reverse.spl shakesbeer.spl -OPTIONS_DEFINE= EXAMPLES - post-patch: .for f in . examples ${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \ diff --git a/lang/spl/files/patch-libspl.c b/lang/spl/files/patch-libspl.c new file mode 100644 index 000000000000..e1519edf96ba --- /dev/null +++ b/lang/spl/files/patch-libspl.c @@ -0,0 +1,10 @@ +--- libspl.c.orig 2021-07-20 09:38:16 UTC ++++ libspl.c +@@ -27,6 +27,7 @@ USA. + #include + #include + ++#define GLOBAL + #include "spl.h" + #include "strutils.h" + diff --git a/lang/spl/files/patch-spl.h b/lang/spl/files/patch-spl.h new file mode 100644 index 000000000000..1ca7fc3b568d --- /dev/null +++ b/lang/spl/files/patch-spl.h @@ -0,0 +1,26 @@ +--- spl.h.orig 2021-07-20 09:35:24 UTC ++++ spl.h +@@ -43,13 +43,17 @@ typedef struct { + + /* global variables */ + +-CHARACTER **cast; +-CHARACTER *first_person; +-CHARACTER *second_person; ++#ifndef GLOBAL ++# define GLOBAL extern ++#endif + +-int truth_flag; +-int num_on_stage; +-int num_cast; ++GLOBAL CHARACTER **cast; ++GLOBAL CHARACTER *first_person; ++GLOBAL CHARACTER *second_person; ++ ++GLOBAL int truth_flag; ++GLOBAL int num_on_stage; ++GLOBAL int num_cast; + + /* function prototypes */ + extern void activate_character(int line, CHARACTER *character);