Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jul 2023 14:45:35 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 77e6f6a8b0b2 - main - audio/denemo: Fix build with llvm16
Message-ID:  <202307211445.36LEjZo3025380@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=77e6f6a8b0b23364ed22dc1e18602e6de70e5b09

commit 77e6f6a8b0b23364ed22dc1e18602e6de70e5b09
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-21 13:25:53 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-21 14:45:27 +0000

    audio/denemo: Fix build with llvm16
    
    - Utilize USES=localbase while I am here
    
    Sponsored by:   The FreeBSD Foundation
---
 audio/denemo/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index cdad24543b7a..4ff869e9e2a0 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -27,7 +27,7 @@ EXTRACT_BEFORE_ARGS=\
 		-s '!\(/Clarinet in B\).*\(\.denemo\)$$!\1b\2!p' -xf
 
 USES=		bison:alias compiler:c++11-lang desktop-file-utils gettext gmake \
-		gnome pkgconfig
+		gnome localbase:ldflags pkgconfig
 USE_GNOME=	intltool librsvg2 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-jack \
@@ -39,8 +39,6 @@ CONFIGURE_ARGS=	--enable-jack \
 		--enable-guile_1_8
 
 CFLAGS+=	-Wno-error=return-type
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LILYPOND PDF
 OPTIONS_SINGLE=		TOOLKIT
@@ -65,6 +63,12 @@ LIB_DEPENDS+=	libevview3.so:graphics/evince
 LIB_DEPENDS+=	libatrilview.so:graphics/atril
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-lpthread|-pthread| ; \
@@ -103,4 +107,4 @@ post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} *.denemo \
 		${STAGEDIR}${EXAMPLESDIR})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



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