Date: Mon, 29 Nov 2021 12:00:00 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 610ffb4fc86b - main - audio/cheesecutter: Fix build on 14-CURRENT Message-ID: <202111291200.1ATC00Yw059315@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=610ffb4fc86b1a28265d7f80a260a0fb888e141c commit 610ffb4fc86b1a28265d7f80a260a0fb888e141c Author: Hiroo Ono <hiroo.ono+freebsd@gmail.com> AuthorDate: 2021-11-29 11:59:05 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> 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 <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if (${OSVERSION} >= 1400042) +MAKE_ARGS= DLDFLAGS=-L=-Wl,-z,nostart-stop-gc +.endif + +.include <bsd.port.post.mk> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111291200.1ATC00Yw059315>