Date: Tue, 30 Oct 2012 08:47:53 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306664 - in head/emulators: mame mess Message-ID: <201210300847.q9U8lrtj054197@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Oct 30 08:47:53 2012 New Revision: 306664 URL: http://svn.freebsd.org/changeset/ports/306664 Log: Move OSVERSION check after bsd.port.pre.mk. Submitted by: KATO Tsuguru <tkato432@yahoo.com> Feature safe: yes Modified: head/emulators/mame/Makefile head/emulators/mess/Makefile Modified: head/emulators/mame/Makefile ============================================================================== --- head/emulators/mame/Makefile Tue Oct 30 08:20:46 2012 (r306663) +++ head/emulators/mame/Makefile Tue Oct 30 08:47:53 2012 (r306664) @@ -51,14 +51,6 @@ UPDATE_PATCHES!= /usr/bin/jot -s " " \ .include <bsd.port.options.mk> -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -.else -USE_GCC= 4.6+ -.endif - .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER} USE_GNOME= gtk20 gconf2 MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \ @@ -77,6 +69,14 @@ MAKE_ENV+= DEBUG=1 .include <bsd.port.pre.mk> +.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 +CC= /usr/bin/clang +CPP= /usr/bin/clang-cpp +CXX= /usr/bin/clang++ +.else +USE_GCC= 4.6+ +.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not install on ia64, powerpc, or sparc64 .endif Modified: head/emulators/mess/Makefile ============================================================================== --- head/emulators/mess/Makefile Tue Oct 30 08:20:46 2012 (r306663) +++ head/emulators/mess/Makefile Tue Oct 30 08:47:53 2012 (r306664) @@ -51,14 +51,6 @@ UPDATE_PATCHES!= /usr/bin/jot -s " " \ .include <bsd.port.options.mk> -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -.else -USE_GCC= 4.6+ -.endif - .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER} USE_GNOME= gtk20 gconf2 MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \ @@ -77,6 +69,14 @@ MAKE_ENV+= DEBUG=1 .include <bsd.port.pre.mk> +.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 +CC= /usr/bin/clang +CPP= /usr/bin/clang-cpp +CXX= /usr/bin/clang++ +.else +USE_GCC= 4.6+ +.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not install on ia64, powerpc, or sparc64 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210300847.q9U8lrtj054197>