Date: Sat, 12 Nov 2016 17:38:26 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425968 - in head: audio/murmur cad/kicad-devel cad/opencascade devel/sdl2pp games/libretro-cores games/stonesoup games/wyrmgus graphics/mapnik multimedia/assimp net-p2p/libtorrent x11-... Message-ID: <201611121738.uACHcQ5D032857@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Nov 12 17:38:26 2016 New Revision: 425968 URL: https://svnweb.freebsd.org/changeset/ports/425968 Log: Spell CHOSEN_COMPILER_TYPE correctly PR: 199098 Modified: head/audio/murmur/Makefile head/cad/kicad-devel/Makefile head/cad/opencascade/Makefile head/devel/sdl2pp/Makefile head/games/libretro-cores/Makefile head/games/stonesoup/Makefile head/games/wyrmgus/Makefile head/graphics/mapnik/Makefile head/multimedia/assimp/Makefile head/net-p2p/libtorrent/Makefile head/x11-fm/wcmcommander/Makefile head/x11-toolkits/wxgtk30/Makefile Modified: head/audio/murmur/Makefile ============================================================================== --- head/audio/murmur/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/audio/murmur/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -58,7 +58,7 @@ CONFIG+= no-bonjour .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/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/cad/kicad-devel/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -184,7 +184,7 @@ PLIST_SHAREDDIR_LIST= share/mimelnk/appl .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1000000 || ${COMPILER_TYPE} == "gcc" +.if ${OSVERSION} < 1000000 || ${CHOSEN_COMPILER_TYPE} == gcc IGNORE= builds only on greater than 10 and with clang .endif .endif Modified: head/cad/opencascade/Makefile ============================================================================== --- head/cad/opencascade/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/cad/opencascade/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -55,7 +55,7 @@ USE_LDCONFIG= yes LOCCROOT= OpenCAS OCCROOT= ${PREFIX}/${LOCCROOT} -PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${COMPILER_TYPE} +PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON @@ -110,17 +110,17 @@ post-build-DOCS-on: (cd ${WRKSRC} && ./gendoc -overview) post-install: - ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE \ + ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE \ ${STAGEDIR}${PREFIX}/bin/ (cd ${STAGEDIR}${PREFIX}/bin && \ - ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE) - ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/lib/lib*.so \ + ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE) + ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/lib*.so \ ${STAGEDIR}${PREFIX}/lib/ (cd ${STAGEDIR}${PREFIX}/lib \ && for l in lib*.so; do \ ${MV} $${l} $${l}.0; \ ${LN} -sf $${l}.0 $${l}; \ - ${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/lib/$${l}; \ + ${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/$${l}; \ done) ${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE (cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE) Modified: head/devel/sdl2pp/Makefile ============================================================================== --- head/devel/sdl2pp/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/devel/sdl2pp/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -30,7 +30,7 @@ DOXYGEN_IMPLIES= DOCS .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif Modified: head/games/libretro-cores/Makefile ============================================================================== --- head/games/libretro-cores/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/games/libretro-cores/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -104,7 +104,7 @@ DOS2UNIX_FILES= hatari/Makefile.libretro .include <bsd.port.pre.mk> # Avoid a lot of patching for 9. -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc USE_CXXSTD= gnu++11 .endif Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/games/stonesoup/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -70,7 +70,7 @@ LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} != clang +.if ${CHOSEN_COMPILER_TYPE} != clang CFLAGS+= -D_GLIBCXX_USE_C99 .endif Modified: head/games/wyrmgus/Makefile ============================================================================== --- head/games/wyrmgus/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/games/wyrmgus/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -69,7 +69,7 @@ PHYSFS_CMAKE_OFF= -DWITH_PHYSFS:BOOL=OFF .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif Modified: head/graphics/mapnik/Makefile ============================================================================== --- head/graphics/mapnik/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/graphics/mapnik/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -78,7 +78,7 @@ CAIRO_MAKE_ARGS_OFF= CAIRO=False .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif Modified: head/multimedia/assimp/Makefile ============================================================================== --- head/multimedia/assimp/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/multimedia/assimp/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -23,7 +23,7 @@ CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc # GCC C++11 support is broken on FreeBSD (see PR 193528 for details) CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif Modified: head/net-p2p/libtorrent/Makefile ============================================================================== --- head/net-p2p/libtorrent/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/net-p2p/libtorrent/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -38,7 +38,7 @@ KQUEUE_CONFIGURE_WITH= kqueue # Disable amd64 atomic ops on i386 when using gcc # undefined reference to __sync_add_and_fetch_8 # undefined reference to __sync_fetch_and_and_8 -.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "gcc" +.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ARGS+=--disable-instrumentation .endif Modified: head/x11-fm/wcmcommander/Makefile ============================================================================== --- head/x11-fm/wcmcommander/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/x11-fm/wcmcommander/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -35,7 +35,7 @@ SSH_CMAKE_BOOL= WITH_LIBSSH2 .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif Modified: head/x11-toolkits/wxgtk30/Makefile ============================================================================== --- head/x11-toolkits/wxgtk30/Makefile Sat Nov 12 16:58:53 2016 (r425967) +++ head/x11-toolkits/wxgtk30/Makefile Sat Nov 12 17:38:26 2016 (r425968) @@ -58,7 +58,7 @@ WEBKIT_LIB_DEPENDS= libwebkitgtk-1.0.so: .include <bsd.port.pre.mk> # PR 196703, 197031 -.if ${COMPILER_TYPE} == "gcc" +.if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ARGS+=--disable-precomp-headers .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611121738.uACHcQ5D032857>