diff options
| author | jkim <jkim@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-06-18 01:31:46 +0800 |
|---|---|---|
| committer | jkim <jkim@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-06-18 01:31:46 +0800 |
| commit | ca3c9d10ba7c0393aab553340b89407d5c6a6ab4 (patch) | |
| tree | 8070ab560a080be21dbd7200efdce0ffbe96363f | |
| parent | c3a61da1f6d36561b232c0bbc926b77a81bf18c8 (diff) | |
| download | xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar.gz xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar.bz2 xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar.lz xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar.xz xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.tar.zst xorg-devel-ports-ca3c9d10ba7c0393aab553340b89407d5c6a6ab4.zip | |
Merge r355979 and r358152.
- Move the ARCH = i386 check to bsd.mesalib.mk.
- Catch up with recent MASTER_SITES changes.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1458 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | graphics/dri/Makefile | 5 | ||||
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index e16f28c..fd19150 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -1,5 +1,5 @@ # Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD: head/graphics/dri/Makefile 354307 2014-05-17 09:56:00Z kwm $ +# $FreeBSD: head/graphics/dri/Makefile 355979 2014-05-31 14:15:47Z kwm $ PORTNAME= dri PORTVERSION= ${MESAVERSION} @@ -26,8 +26,7 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto CC=clang CXX=clang++ CPP=clang-cpp -# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older. -. elif ${OSVERSION} < 901500 || ${ARCH} == i386 +. elif ${OSVERSION} < 901500 USE_GCC=yes . endif .endif diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 4e1c0af..19e59e6 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -9,7 +9,7 @@ # - grahpics/libglesv2 # - graphics/dri # -# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 354307 2014-05-17 09:56:00Z kwm $ +# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 358152 2014-06-17 17:23:07Z jkim $ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} @@ -25,7 +25,7 @@ MESASUBVERSION= PLIST_SUB+= OLD="" NEW="@comment " .endif -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/ DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org @@ -56,6 +56,11 @@ SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ src/mapi/mapi/mapi_abi.py + +# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older. +. if ${ARCH} == i386 +USE_GCC=yes +. endif .else CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu |