Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Aug 2023 18:01:34 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: 54fb1ff13211 - main - misc/hotkeys: Fix build with llvm16
Message-ID:  <202308051801.375I1Y5d090132@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=54fb1ff1321110d95b825e7f2d15b3557d08574e

commit 54fb1ff1321110d95b825e7f2d15b3557d08574e
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-05 15:08:19 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-05 18:01:11 +0000

    misc/hotkeys: Fix build with llvm16
    
    - Pet portclippy
    
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 misc/hotkeys/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index b0556e23f46f..fe7a5b2c2193 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -14,14 +14,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USES=		bdb gmake xorg
+USE_XORG=	x11 xft xkbfile xmu
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
 		--with-db3-lib=${BDB_LIB_DIR} \
 		--with-db-name=${BDB_LIB_NAME}
 
-USES=		bdb gmake xorg
-USE_XORG=	x11 xft xkbfile xmu
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD
@@ -29,6 +30,12 @@ OPTIONS_DEFAULT=	OSD
 OSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 OSD_CONFIGURE_WITH=	xosd
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-extract:
 	@${CP} ${PATCHDIR}/error.h ${WRKSRC}/src
 	@${CP} ${PATCHDIR}/eliteduo.def ${WRKSRC}/def
@@ -37,6 +44,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e '/^install-exec-am/s/install-sysconfDATA//' \
 		${WRKSRC}/src/Makefile.in
+
 post-configure:
 	${REINPLACE_CMD} -e 's,-lXinerama,-lXinerama `pkgconf --libs pangoxft`,g' ${WRKSRC}/src/Makefile
 



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