Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Apr 2021 08:15:09 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1f090b794c9b - main - audio/ardour6: drop bsd.port.pre.mk
Message-ID:  <202104060815.1368F9Fp090774@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f090b794c9bbf9be1fc04b30ae954bbe30f7864

commit 1f090b794c9bbf9be1fc04b30ae954bbe30f7864
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2017-01-29 14:03:56 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-04-06 08:11:39 +0000

    audio/ardour6: drop bsd.port.pre.mk
---
 audio/ardour6/Makefile | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/audio/ardour6/Makefile b/audio/ardour6/Makefile
index e947b56247c7..2f0981d6b362 100644
--- a/audio/ardour6/Makefile
+++ b/audio/ardour6/Makefile
@@ -57,7 +57,11 @@ BINARY_ALIAS+=	gas=${CC}
 PLIST_SUB=	ARDOURVERSION=${PORTVERSION}
 
 CONFIGURE_ARGS=	--optimize --ptformat --freedesktop --no-phone-home \
-		--with-backends=jack,dummy --internal-shared-libs --no-vst3
+		--with-backends=jack,dummy --internal-shared-libs --no-vst3 \
+		${CONFIGURE_ARGS_${ARCH}}
+CONFIGURE_ARGS_amd64=	--arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
+# only support for i686 or better
+CONFIGURE_ARGS_i386=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/obj\.use            = '\''libsmf libpbd'\''/obj\.use            = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript
@@ -103,17 +107,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-# only support for i686 or better
-WITH_ARCH_FLAGS=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
-.elif ${ARCH} == "amd64"
-WITH_ARCH_FLAGS=	--arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
-.endif
-
-.if defined(WITH_ARCH_FLAGS)
-CONFIGURE_ARGS+=	${WITH_ARCH_FLAGS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104060815.1368F9Fp090774>