From nobody Mon Nov 29 12:00:00 2021 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 D668318B4113; Mon, 29 Nov 2021 12:00:00 +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 4J2kS0476Fz3tF5; Mon, 29 Nov 2021 12:00:00 +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 6A4F42201E; Mon, 29 Nov 2021 12:00:00 +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 1ATC00Np059343; Mon, 29 Nov 2021 12:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATC00Yw059315; Mon, 29 Nov 2021 12:00:00 GMT (envelope-from git) Date: Mon, 29 Nov 2021 12:00:00 GMT Message-Id: <202111291200.1ATC00Yw059315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 610ffb4fc86b - main - audio/cheesecutter: Fix build on 14-CURRENT 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 610ffb4fc86b1a28265d7f80a260a0fb888e141c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638187200; 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=5rMHbBXV+ww8MZUkTuDxPsgRhfgQlQdmjTii6sRw9yo=; b=X09MaqLmMiaUdD7AkHUD55ftMCFQIL7ZoWVD5TgxA2H9lC55PxUtrvRsZ2W5ly6F90lsuO OWac5Z2BZShjWFSARHMq/Xw7BPxYShKHMibPzeULFRwz7nw6egoBABg71Kdv9VcQqsgY5s LcHAom/oXntC1/OE6qRuHa5IN4ObB/kVZFlUZ1uOUpDF0giQjIT8bGAx94or7652NMUnRM czMcKSLG4YaPPbmJn4w18ve3OOJPQDl7saH/uqp2v6Bm43LwP4u6BaY3JnBYYKWB9NTjkE ujxuHoW8/CwB5JqPt5VIpMxSleOmkqCKTCM/jzBOjNVM1btiysLSr3tIh4Ns4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638187200; a=rsa-sha256; cv=none; b=gIuyBBRKZlK/rmzRumnfyrk6lKPiw5ShsafFdGsW6djAz9FC3P5WbsM3cErRIkRFSimUcI oE2At0V7EvDLgAgDz9LbVuqL2yYIslLXuuuIpHAow37ZUdwb1BHITWmVEmAghoOHGobPnj 99mBEgKz2npqeCFlz7W8R3KXGgsbmMCUb7pM4vnVOkk/cO2vQmR8qzwe7UwYTpHvThzMe6 M7J4NC6YloRLNakhq0Cf74W9LcjtnV+oUFXCCUKAYo4kWpYEzXnLjij5HyxQu2ID8WP4LS gD+FFXM6ZemYQm8jPGCG/kdAurUZeAUKrALpI4adQDzd60aPpFrkXj0lE8mG3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=610ffb4fc86b1a28265d7f80a260a0fb888e141c commit 610ffb4fc86b1a28265d7f80a260a0fb888e141c Author: Hiroo Ono AuthorDate: 2021-11-29 11:59:05 +0000 Commit: Emanuel Haupt CommitDate: 2021-11-29 11:59:05 +0000 audio/cheesecutter: Fix build on 14-CURRENT PR: 260106 --- audio/cheesecutter/Makefile | 11 ++++++++--- audio/cheesecutter/files/patch-Makefile.ldc | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile index bfecc3c9b45e..9614669dd114 100644 --- a/audio/cheesecutter/Makefile +++ b/audio/cheesecutter/Makefile @@ -4,6 +4,7 @@ PORTNAME= cheesecutter DISTVERSIONPREFIX= v DISTVERSION= 2.9-beta-3-25 DISTVERSIONSUFFIX= -gdbe9a9d +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org @@ -12,8 +13,6 @@ COMMENT= Tracker for composing music for the C64 SID chip LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN_FreeBSD_14= ld: error: undefined hidden symbol: __start___minfo - BUILD_DEPENDS= acme:devel/acme \ ldc2:lang/ldc @@ -37,4 +36,10 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${MANPREFIX}/share/man/fr/man1 .endfor -.include +.include + +.if (${OSVERSION} >= 1400042) +MAKE_ARGS= DLDFLAGS=-L=-Wl,-z,nostart-stop-gc +.endif + +.include diff --git a/audio/cheesecutter/files/patch-Makefile.ldc b/audio/cheesecutter/files/patch-Makefile.ldc index 2c3ddca6aaa5..2bab9007ea46 100644 --- a/audio/cheesecutter/files/patch-Makefile.ldc +++ b/audio/cheesecutter/files/patch-Makefile.ldc @@ -8,7 +8,24 @@ LIBS=-L-ldl -L-lstdc++ COMFLAGS=-O2 VERSION=$(shell cat Version) -@@ -38,10 +40,10 @@ c64: $(C64OBJS) +@@ -19,7 +21,7 @@ include Makefile.objects.mk + all: ct2util ccutter + + ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS) +- $(DC) $(COMFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS) ++ $(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS) + + + .cpp.o : $(CXX_SRCS) +@@ -31,17 +33,17 @@ ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS) + ct: $(C64OBJS) $(CTOBJS) + + ct2util: $(C64OBJS) $(UTILOBJS) +- $(DC) $(COMFLAGS) -of=$@ $(UTILOBJS) ++ $(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(UTILOBJS) + + c64: $(C64OBJS) + install: all strip ccutter$(EXE) strip ct2util$(EXE)