diff options
author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-02 17:24:16 +0800 |
---|---|---|
committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-02 17:24:16 +0800 |
commit | 394481fd880b0c08ddcb4ebe23ce3c94556d768f (patch) | |
tree | 50af6f826e8c24030448ca93462ca6dff609d676 | |
parent | f2e2701420f512551a3f40f384c7d4131f8d9338 (diff) | |
download | xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar.gz xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar.bz2 xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar.lz xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar.xz xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.tar.zst xorg-devel-ports-394481fd880b0c08ddcb4ebe23ce3c94556d768f.zip |
Restrict GALLIUM to x86 archs. little bit cleanup. For 9.x and 8.x depend
on USE_GCC if we are not on a x86 arch.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1130 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r-- | graphics/dri/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index 1a7a60b..53c8b83 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -20,13 +20,18 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto # gcc from base can't handle some code in mesa 9.1+ # We only care for 9.x and 8.x, not for old pre-clang default current. .if defined(WITH_NEW_XORG) -. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 +. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} == i386 || ${ARCH} == amd64) CC=clang CXX=clang++ CPP=clang-cpp . elif ${OSVERSION} < 901500 USE_GCC=yes . endif +# for archs that don't have clang at all or isn't mature enough/untested. +. if ${ARCH} != i386 && ${ARCH} != amd64 +USE_GCC=yes +. endif .endif .if ${ARCH} == ia64 @@ -48,19 +53,14 @@ DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif .if defined(WITH_NEW_XORG) -. if defined(WITH_GALLIUM) +. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 RUN_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl -# --disable-opengl -#CONFIGURE_ARGS+=--enable-r600-llvm-compiler CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast -# comma delimited Gallium drivers list, e.g. -# "i915,nouveau,r300,r600,radeonsi,svga,swrast" -# [default=r300,r600,svga,swrast PLIST_SUB+= GALLIUM="" . else CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers @@ -93,7 +93,8 @@ CONFIGURE_ARGS+=--disable-gallium-intel .endif CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}" -.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} == i386 || ${ARCH} == amd64) pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers." |