Attachment 194992 Details for Bug 229626 – patch to remove annoying messages

[patch] patch to remove annoying messages

compiler_mk_tier2.patch (text/plain), 4.27 KB, created by Mark Linimon on 2018-07-09 12:02:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2018-07-09 12:02:49 UTC

Size: 4.27 KB

patch

obsolete

>Index: Mk/Uses/compiler.mk
>===================================================================
>--- Mk/Uses/compiler.mk	(revision 473958)
>+++ Mk/Uses/compiler.mk	(working copy)
>@@ -177,17 +177,11 @@
> USE_GCC=	yes
> CHOSEN_COMPILER_TYPE=	gcc
> .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) || ${COMPILER_TYPE} == gcc
>+CHOSEN_COMPILER_TYPE=	clang
> .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50
>-CPP=	clang-cpp
>-CC=	clang
>-CXX=	clang++
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	base
> .else
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>-CPP=	${LOCALBASE}/bin/clang-cpp60
>-CC=	${LOCALBASE}/bin/clang60
>-CXX=	${LOCALBASE}/bin/clang++60
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	60
> .endif
> .endif
> .endif
>@@ -199,17 +193,11 @@
> USE_GCC=	yes
> CHOSEN_COMPILER_TYPE=	gcc
> .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
>+CHOSEN_COMPILER_TYPE=	clang
> .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
>-CPP=	clang-cpp
>-CC=	clang
>-CXX=	clang++
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	base
> .else
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>-CPP=	${LOCALBASE}/bin/clang-cpp60
>-CC=	${LOCALBASE}/bin/clang60
>-CXX=	${LOCALBASE}/bin/clang++60
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	60
> .endif
> .endif
> .endif
>@@ -221,17 +209,11 @@
> USE_GCC=	yes
> CHOSEN_COMPILER_TYPE=	gcc
> .elif ${COMPILER_TYPE} == gcc
>+CHOSEN_COMPILER_TYPE=	clang
> .if ${ALT_COMPILER_TYPE} == clang
>-CPP=	clang-cpp
>-CC=	clang
>-CXX=	clang++
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	base
> .else
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>-CPP=	${LOCALBASE}/bin/clang-cpp60
>-CC=	${LOCALBASE}/bin/clang60
>-CXX=	${LOCALBASE}/bin/clang++60
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	60
> .endif
> .endif
> .endif
>@@ -243,17 +225,11 @@
> USE_GCC=	yes
> CHOSEN_COMPILER_TYPE=	gcc
> .elif ${COMPILER_TYPE} == gcc
>+CHOSEN_COMPILER_TYPE=	clang
> .if ${ALT_COMPILER_TYPE} == clang
>-CPP=	clang-cpp
>-CC=	clang
>-CXX=	clang++
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	base
> .else
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>-CHOSEN_COMPILER_TYPE=	clang
>-CPP=	${LOCALBASE}/bin/clang-cpp60
>-CC=	${LOCALBASE}/bin/clang60
>-CXX=	${LOCALBASE}/bin/clang++60
>+REALLY_REALLY_WANT_CLANG=	60
> .endif
> .endif
> .endif
>@@ -265,17 +241,11 @@
> USE_GCC=	yes
> CHOSEN_COMPILER_TYPE=	gcc
> .elif ${COMPILER_TYPE} == gcc
>+CHOSEN_COMPILER_TYPE=	clang
> .if ${ALT_COMPILER_TYPE} == clang
>-CPP=	clang-cpp
>-CC=	clang
>-CXX=	clang++
>-CHOSEN_COMPILER_TYPE=	clang
>+REALLY_REALLY_WANT_CLANG=	base
> .else
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>-CHOSEN_COMPILER_TYPE=	clang
>-CPP=	${LOCALBASE}/bin/clang-cpp60
>-CC=	${LOCALBASE}/bin/clang60
>-CXX=	${LOCALBASE}/bin/clang++60
>+REALLY_REALLY_WANT_CLANG=	60
> .endif
> .endif
> .endif
>@@ -294,4 +264,33 @@
> .endif
> .endif
> 
>+.if defined(REALLY_REALLY_WANT_CLANG)
>+.if ${ALT_COMPILER_TYPE} == clang || $(REALLY_REALLY_WANT_CLANG) == base
>+CPP=	clang-cpp
>+CC=	clang
>+CXX=	clang++
>+CHOSEN_COMPILER_TYPE=	clang
>+.elif $(REALLY_REALLY_WANT_CLANG) == 60
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
>+CHOSEN_COMPILER_TYPE=	clang
>+CPP=	${LOCALBASE}/bin/clang-cpp60
>+CC=	${LOCALBASE}/bin/clang60
>+CXX=	${LOCALBASE}/bin/clang++60
>+.elif $(REALLY_REALLY_WANT_CLANG) == 50
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
>+CHOSEN_COMPILER_TYPE=	clang
>+CPP=	${LOCALBASE}/bin/clang-cpp50
>+CC=	${LOCALBASE}/bin/clang50
>+CXX=	${LOCALBASE}/bin/clang++50
>+.elif $(REALLY_REALLY_WANT_CLANG) == 40
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
>+CHOSEN_COMPILER_TYPE=	clang
>+CPP=	${LOCALBASE}/bin/clang-cpp40
>+CC=	${LOCALBASE}/bin/clang40
>+CXX=	${LOCALBASE}/bin/clang++40
>+.else
>+.warning "REALLY_REALLY_WANT_CLANG defined to something other than 40,50, 60: ${REALLY_REALLY_WANT_CLANG}"
> .endif
>+.endif
>+
>+.endif
>Index: sysutils/osquery/Makefile
>===================================================================
>--- sysutils/osquery/Makefile	(revision 473958)
>+++ sysutils/osquery/Makefile	(working copy)
>@@ -66,9 +66,10 @@
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 1100000
>-BUILD_DEPENDS+=	clang40:devel/llvm40
>-CC=	clang40
>-CXX=	clang++40
>+REALLY_REALLY_WANT_CLANG=	40
>+#BUILD_DEPENDS+=	clang40:devel/llvm40
>+#CC=	clang40
>+#CXX=	clang++40
> .endif
> 
> post-patch:

Actions: View | Diff

Attachments on bug 229626: 194991 | 194992