Date: Fri, 17 May 2013 07:52:46 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318359 - in head/graphics/libosmesa: . files Message-ID: <201305170752.r4H7qkxo041957@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri May 17 07:52:45 2013 New Revision: 318359 URL: http://svnweb.freebsd.org/changeset/ports/318359 Log: - Update to 9.1.2 - Fix build on < 900014 by depending on gcc 4.6+ [1] Obtained from: emulators/fceux (r315330) [1] Reported by: awarecons <awarecons@gmail.com> [1] Modified: head/graphics/libosmesa/Makefile head/graphics/libosmesa/distinfo head/graphics/libosmesa/files/patch-scons_gallium.py Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Fri May 17 07:50:38 2013 (r318358) +++ head/graphics/libosmesa/Makefile Fri May 17 07:52:45 2013 (r318359) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libosmesa -PORTVERSION= 9.0.2 +PORTVERSION= 9.1.2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/ DISTNAME= MesaLib-${PORTVERSION} @@ -26,7 +26,12 @@ USE_SCONS= yes SCONS_TARGET= osmesa SCONS_ARGS+= build=release \ verbose=yes -CCFLAGS+= -I${LOCALBASE}/include +SCONS_BUILDENV= CC="${CC}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAKE_JOBS_UNSAFE= @@ -34,6 +39,16 @@ WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} .include <bsd.port.pre.mk> +.if (empty(CC:T:Mgcc4*) && empty(CC:T:Mclang*)) || (empty(CXX:T:Mg??4*) && empty(CXX:T:Mclang++*)) +.if (${OSVERSION} >= 900014) && (exists(/usr/bin/clang++) && exists(/usr/bin/clang)) +CC= /usr/bin/clang +CXX= /usr/bin/clang++ +CPP= /usr/bin/clang-cpp +.else +USE_GCC=4.6+ +.endif +.endif + .if ${ARCH} == "i386" SCONS_ARGS+= machine=x86 SCONS_BUILD_DIR=${WRKSRC}/build/freebsd-x86 Modified: head/graphics/libosmesa/distinfo ============================================================================== --- head/graphics/libosmesa/distinfo Fri May 17 07:50:38 2013 (r318358) +++ head/graphics/libosmesa/distinfo Fri May 17 07:52:45 2013 (r318359) @@ -1,2 +1,2 @@ -SHA256 (MesaLib-9.0.2.tar.bz2) = 75bf31f26c6e7b5515e610c1005fd1be1f7eeb2c9e6859848dab879c355ad64e -SIZE (MesaLib-9.0.2.tar.bz2) = 6132857 +SHA256 (MesaLib-9.1.2.tar.bz2) = 0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db +SIZE (MesaLib-9.1.2.tar.bz2) = 6122642 Modified: head/graphics/libosmesa/files/patch-scons_gallium.py ============================================================================== --- head/graphics/libosmesa/files/patch-scons_gallium.py Fri May 17 07:50:38 2013 (r318358) +++ head/graphics/libosmesa/files/patch-scons_gallium.py Fri May 17 07:52:45 2013 (r318359) @@ -1,5 +1,5 @@ ---- scons/gallium.py.orig 2012-11-09 19:16:31.000000000 +0100 -+++ scons/gallium.py 2013-01-14 17:25:58.000000000 +0100 +--- scons/gallium.py.orig 2013-03-20 00:28:25.000000000 +0100 ++++ scons/gallium.py 2013-05-15 09:37:15.000000000 +0200 @@ -246,11 +246,11 @@ cppdefines += ['PROFILE'] if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'): @@ -17,7 +17,7 @@ 'HAVE_PTHREAD', 'HAVE_POSIX_MEMALIGN', ] -@@ -499,7 +499,9 @@ +@@ -501,7 +501,9 @@ # Default libs libs = [] if env['platform'] in ('darwin', 'freebsd', 'linux', 'posix', 'sunos'): @@ -25,6 +25,6 @@ + libs += ['m', 'pthread'] + if env['platform'] != 'freebsd': + libs += ['dl'] + if env['platform'] in ('linux',): + libs += ['rt'] env.Append(LIBS = libs) - - # OpenMP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305170752.r4H7qkxo041957>