From owner-svn-ports-all@freebsd.org Mon Aug 31 12:22:33 2020 Return-Path: Delivered-To: svn-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 9E9733BFFAB; Mon, 31 Aug 2020 12:22:33 +0000 (UTC) (envelope-from trasz@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bg8V13mfGz4RpP; Mon, 31 Aug 2020 12:22:33 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 663D127BA0; Mon, 31 Aug 2020 12:22:33 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VCMXXo097280; Mon, 31 Aug 2020 12:22:33 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VCMXHw097278; Mon, 31 Aug 2020 12:22:33 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008311222.07VCMXHw097278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 31 Aug 2020 12:22:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547170 - in head/lang/cbmbasic: . files X-SVN-Group: ports-head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/lang/cbmbasic: . files X-SVN-Commit-Revision: 547170 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 12:22:33 -0000 Author: trasz Date: Mon Aug 31 12:22:32 2020 New Revision: 547170 URL: https://svnweb.freebsd.org/changeset/ports/547170 Log: Fix build ("ld: error: duplicate symbol: RAM"). Added: head/lang/cbmbasic/files/ head/lang/cbmbasic/files/patch-Makefile (contents, props changed) Modified: head/lang/cbmbasic/Makefile Modified: head/lang/cbmbasic/Makefile ============================================================================== --- head/lang/cbmbasic/Makefile Mon Aug 31 11:59:09 2020 (r547169) +++ head/lang/cbmbasic/Makefile Mon Aug 31 12:22:32 2020 (r547170) @@ -15,6 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= mist64 GH_TAGNAME= 89093eba090d6e1c2d2b6e1cb1616dba0ce9c7f6 +CFLAGS+= -fcommon + PLIST_FILES= bin/cbmbasic do-install: Added: head/lang/cbmbasic/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cbmbasic/files/patch-Makefile Mon Aug 31 12:22:32 2020 (r547170) @@ -0,0 +1,14 @@ +--- Makefile.orig 2014-12-06 23:57:18 UTC ++++ Makefile +@@ -1,10 +1,9 @@ + OBJS=cbmbasic.o runtime.o plugin.o console.o +-CFLAGS=-Wall -O3 + + all: cbmbasic + + cbmbasic: $(OBJS) +- $(CC) -o cbmbasic $(OBJS) ++ $(CC) $(CFLAGS) -o cbmbasic $(OBJS) + + clean: + rm -f $(OBJS) cbmbasic