Peter Jeremy <pe...@rulingia.com> writes:
> r459270 created hard references to clang38 and clang++38 in
> misc/sword/Makefile and, as a result, "make index" is reporting warnings:
>
> --- describe.misc ---
> sh: clang38: not found
> make[5]: "/usr/ports/Mk/Uses/compiler.mk" line 69: warning: "clang38
> --version"
> +returned non-zero status
> make[5]: "/usr/ports/Mk/Uses/compiler.mk" line 112: warning: "clang++38 -###
> +/dev/null 2>&1" returned non-zero status
>
> Is there a cleaner way to define the required compiler?
Maybe someone can help testing bug 225276 fix. Otherwise, see below for
a workaround that adds blame churn.
>From 55d31c036a47e66b7ab65b4cf59aec3ea241f594 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbe...@freebsd.org>
Date: Mon, 12 Feb 2018 11:20:32 +0000
Subject: [PATCH] misc/sword: workaround CC vs. USES=compiler conflict after
r461290
$ make describe >/dev/null
sh: clang38: not found
make: "/usr/ports/Mk/Uses/compiler.mk" line 69: warning: "clang38 --version"
returned non-zero status
make: "/usr/ports/Mk/Uses/compiler.mk" line 112: warning: "clang++38 -###
/dev/null 2>&1" returned non-zero status
Reported by: many
---
misc/sword/Makefile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index ea1da73cbb89..a9ae209aba2a 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -15,11 +15,6 @@ LICENSE= GPLv2
BUILD_DEPENDS= cppunit-config:devel/cppunit
-# Workaround for for FreeBSD_11+.
-BUILD_DEPENDS+= clang38:lang/clang38
-CC= clang38
-CXX= clang++38
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-conf --with-zlib
INSTALL_TARGET= install-strip
@@ -52,6 +47,15 @@ CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu
CONFIGURE_ARGS+= --without-clucene --without-icu
.endif
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+# Workaround for for FreeBSD_11+.
+BUILD_DEPENDS+= clang38:lang/clang38
+CC= clang38
+CXX= clang++38
+.endif
+
post-patch:
@${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure
@@ -60,4 +64,4 @@ post-install:
${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \
${STAGEDIR}${PREFIX}/etc/sword.conf.sample
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
_______________________________________________
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
