svn commit: r487230 - in head: audio/mumble chinese/gcin-qt5 databases/ldb12 databases/p5-Tie-LevelDB databases/rocksdb devel/astyle devel/gdb devel/libastylej devel/llvm-cheri devel/rapidjson deve...
Antoine Brodin
antoine at FreeBSD.org
Tue Dec 11 10:10:07 UTC 2018
Author: antoine
Date: Tue Dec 11 10:10:02 2018
New Revision: 487230
URL: https://svnweb.freebsd.org/changeset/ports/487230
Log:
Spell CHOSEN_COMPILER_TYPE correctly
PR: 199098
With hat: portmgr
Modified:
head/audio/mumble/Makefile
head/chinese/gcin-qt5/Makefile
head/databases/ldb12/Makefile
head/databases/p5-Tie-LevelDB/Makefile
head/databases/rocksdb/Makefile
head/devel/astyle/Makefile
head/devel/gdb/Makefile
head/devel/libastylej/Makefile
head/devel/llvm-cheri/Makefile
head/devel/rapidjson/Makefile
head/devel/thrift-cpp/Makefile
head/editors/libreoffice/Makefile
head/editors/openoffice-4/Makefile
head/editors/openoffice-devel/Makefile
head/games/rubix/Makefile
head/games/stockfish/Makefile
head/graphics/aaphoto/Makefile
head/www/node/Makefile
head/www/node10/Makefile
head/www/node6/Makefile
head/www/node8/Makefile
head/x11-toolkits/fox17/Makefile
Modified: head/audio/mumble/Makefile
==============================================================================
--- head/audio/mumble/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/audio/mumble/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -62,7 +62,7 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
.include <bsd.port.pre.mk>
# PCH is broken on GCC
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIG+= no-pch
.endif
Modified: head/chinese/gcin-qt5/Makefile
==============================================================================
--- head/chinese/gcin-qt5/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/chinese/gcin-qt5/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -25,18 +25,8 @@ MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
PLIST_FILES= ${QT_PLUGINDIR}/platforminputcontexts/libgcinplatforminputcontextplugin.so
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 60
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
-CPP= ${LOCALBASE}/bin/clang-cpp60
-CC= ${LOCALBASE}/bin/clang60
-CXX= ${LOCALBASE}/bin/clang++60
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g; \
s,%%MOC%%,${MOC},;' ${WRKSRC}/Makefile
- @${ECHO} "XXXX: ${COMPILER_VERSION}"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/ldb12/Makefile
==============================================================================
--- head/databases/ldb12/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/databases/ldb12/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -133,7 +133,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpag
xsltproc:textproc/libxslt
.endif
# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
+.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -fno-color-diagnostics
.endif
CONFIGURE_ENV+= NOCOLOR=yes
Modified: head/databases/p5-Tie-LevelDB/Makefile
==============================================================================
--- head/databases/p5-Tie-LevelDB/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/databases/p5-Tie-LevelDB/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -26,7 +26,7 @@ MAKE_ARGS= CC="${CXX}"
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -Wno-reserved-user-defined-literal
.endif
Modified: head/databases/rocksdb/Makefile
==============================================================================
--- head/databases/rocksdb/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/databases/rocksdb/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -68,12 +68,8 @@ PLIST_SUB+= LITE=${PKGNAMESUFFIX}
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
+.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-inconsistent-missing-override
-.endif
-
-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60
-CFLAGS+= -D_GLIBCXX_USE_C99
.endif
post-patch:
Modified: head/devel/astyle/Makefile
==============================================================================
--- head/devel/astyle/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/astyle/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -22,7 +22,7 @@ USES= compiler:c++11-lang dos2unix gmake
ALL_TARGET= astyle
DOS2UNIX_GLOB= *.ini
-WRKSRC= ${WRKDIR}/astyle/build/${COMPILER_TYPE}
+WRKSRC= ${WRKDIR}/astyle/build/${CHOSEN_COMPILER_TYPE}
OPTIONS_DEFINE= DOCS EXAMPLES
Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/gdb/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -92,11 +92,11 @@ EXCLUDE+= readline
EXCLUDE+= zlib
.endif
-.if ${ARCH} == "amd64"
+.if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif
-.if ${COMPILER_TYPE} == "clang"
+.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -Wno-extended-offsetof
.endif
Modified: head/devel/libastylej/Makefile
==============================================================================
--- head/devel/libastylej/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/libastylej/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -20,7 +20,7 @@ USE_JAVA= yes
USE_LDCONFIG= yes
MAKE_ARGS+= JAVA_HOME=${JAVA_HOME}
-WRKSRC= ${WRKDIR}/astyle/build/${COMPILER_TYPE}
+WRKSRC= ${WRKDIR}/astyle/build/${CHOSEN_COMPILER_TYPE}
PLIST_FILES= lib/jni/libastylej${PKGNAMESUFFIX}.so lib/jni/libastylej${PKGNAMESUFFIX}.so.${PORTVERSION}
Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/llvm-cheri/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -195,13 +195,13 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1
.include <bsd.port.pre.mk>
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
+.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} != clang
# Evil hack around gcc48 not providing a usable c++11 environment on 9.x
PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment "
.endif
post-extract-LLDB-on:
-.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
+.if ${OPSYS} != FreeBSD || ${CHOSEN_COMPILER_TYPE} == clang
${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
.endif
Modified: head/devel/rapidjson/Makefile
==============================================================================
--- head/devel/rapidjson/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/rapidjson/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -41,7 +41,7 @@ CXXFLAGS_powerpc= -Wno-error
CXXFLAGS_powerpcspe= -Wno-error
CXXFLAGS_powerpc64= -Wno-error
CXXFLAGS_sparc64= -Wno-error
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 50
+.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-zero-as-null-pointer-constant
.endif
Modified: head/devel/thrift-cpp/Makefile
==============================================================================
--- head/devel/thrift-cpp/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/devel/thrift-cpp/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -63,7 +63,7 @@ EXPIRATION_DATE= 2019-03-15
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
USE_CXXSTD= c++11
.endif
Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/editors/libreoffice/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -286,11 +286,8 @@ EXPIRATION_DATE= 2018-12-31
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == "clang"
-CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter
-.if ${COMPILER_VERSION} >= 36
-CXXFLAGS_WARN+= -Wno-unused-local-typedefs
-.endif
+.if ${CHOSEN_COMPILER_TYPE} == clang
+CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-local-typedefs
.else
CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual
.endif
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/editors/openoffice-4/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -207,9 +207,9 @@ CONFIGURE_ARGS+= --enable-symbols
.include <${FILESDIR}/Makefile.localized>
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
CPPFLAGS+= -I${LOCALBASE}/include
-. if ${COMPILER_VERSION} >= 40 && ${ARCH} == amd64
+. if ${ARCH} == amd64
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16
. endif
.endif
@@ -368,7 +368,7 @@ post-patch:
${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
${WRKSRC}/desktop/scripts/soffice.sh
${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
# affects fmgridif.cxx and ColumnControl.cxx
# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
@@ -376,7 +376,7 @@ post-patch:
${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
fi
-.elif ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
+.elif ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
# autodoc and uno (bridgetest) core dump when built with with -Os
# on i386, affects file.cxx and bridgetest.cxx (at least).
# Using -O2 optimiztion works, and -Os is essentially -O2 with out
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/editors/openoffice-devel/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -241,7 +241,7 @@ CONFIGURE_ARGS+= --without-commons-logging
.include <${FILESDIR}/Makefile.localized>
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
CPPFLAGS+= -I${LOCALBASE}/include
.endif
Modified: head/games/rubix/Makefile
==============================================================================
--- head/games/rubix/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/games/rubix/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
-.if (${ARCH} == mips || ${ARCH} == mips64 || ${ARCH} == powerpc || ${ARCH} == powerpc64) && ${COMPILER_TYPE} == gcc
+.if (${ARCH} == mips || ${ARCH} == mips64 || ${ARCH} == powerpc || ${ARCH} == powerpc64) && ${CHOSEN_COMPILER_TYPE} == gcc
CFLAGS+= -fnested-functions
.endif
Modified: head/games/stockfish/Makefile
==============================================================================
--- head/games/stockfish/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/games/stockfish/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -24,7 +24,7 @@ USES= compiler:c++11-lang gmake zip
NO_WRKSUBDIR= yes
WRKSRC_SUBDIR= src
MYARCH= ${ARCH}
-MYCC= ${COMPILER_TYPE}
+MYCC= ${CHOSEN_COMPILER_TYPE}
TGTBLD= build
PLIST_FILES= bin/stockfish
Modified: head/graphics/aaphoto/Makefile
==============================================================================
--- head/graphics/aaphoto/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/graphics/aaphoto/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -28,7 +28,7 @@ PLIST_FILES= bin/aaphoto
.include <bsd.port.pre.mk>
-.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${COMPILER_TYPE} == gcc
+.if (${ARCH} == amd64 || ${ARCH} == i386) && ${CHOSEN_COMPILER_TYPE} == gcc
CFLAGS+= -fopenmp -D__OPENMP__
.endif
Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/www/node/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -82,7 +82,7 @@ IGNORE= cannot build node.js with LibreSSL. You must
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
# GCC does not expose std::snprintf() without this define
CXXFLAGS+= -D_GLIBCXX_USE_C99
.endif
Modified: head/www/node10/Makefile
==============================================================================
--- head/www/node10/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/www/node10/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -83,7 +83,7 @@ IGNORE= cannot build node.js with LibreSSL. You must
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
# GCC does not expose std::snprintf() without this define
CXXFLAGS+= -D_GLIBCXX_USE_C99
.endif
Modified: head/www/node6/Makefile
==============================================================================
--- head/www/node6/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/www/node6/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -74,7 +74,7 @@ IGNORE= cannot build node.js with LibreSSL. You must
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
# GCC does not expose std::snprintf() without this define
CXXFLAGS+= -D_GLIBCXX_USE_C99
.endif
Modified: head/www/node8/Makefile
==============================================================================
--- head/www/node8/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/www/node8/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -78,7 +78,7 @@ IGNORE= cannot build node.js with LibreSSL. You must
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
# GCC does not expose std::snprintf() without this define
CXXFLAGS+= -D_GLIBCXX_USE_C99
.endif
Modified: head/x11-toolkits/fox17/Makefile
==============================================================================
--- head/x11-toolkits/fox17/Makefile Tue Dec 11 09:31:31 2018 (r487229)
+++ head/x11-toolkits/fox17/Makefile Tue Dec 11 10:10:02 2018 (r487230)
@@ -69,7 +69,7 @@ CXXFLAGS+= -O2 -ffast-math
. if !${PORT_OPTIONS:MPROFILE}
CXXFLAGS+= -fomit-frame-pointer
. endif
-. if ${COMPILER_TYPE} == "gcc"
+. if ${CHOSEN_COMPILER_TYPE} == gcc
CXXFLAGS+= -fexpensive-optimizations -finline-functions
. endif
.endif
More information about the svn-ports-all
mailing list