diff options
| author | tron <tron@pkgsrc.org> | 2008-06-03 11:06:17 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-06-03 11:06:17 +0000 |
| commit | b01f7840230ce3d2f97d3c5053618100a9294b64 (patch) | |
| tree | b651c7aa532781e001dd7e07729b815f92c44605 | |
| parent | 861310a5020f9f78e4bbdd96c02d1cf370b22b10 (diff) | |
| download | pkgsrc-b01f7840230ce3d2f97d3c5053618100a9294b64.tar.gz | |
Don't offer "dri" as an option on systems which use XFree86 because it
breaks the build. This fixes PR pkg/38676 by Roland Sieker.
| -rw-r--r-- | graphics/MesaLib/options.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 18aa11cf6e7..d739b19127f 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2008/06/03 06:59:12 dsainty Exp $ +# $NetBSD: options.mk,v 1.9 2008/06/03 11:06:17 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap @@ -46,8 +46,9 @@ PKG_SUGGESTED_OPTIONS= mesa-execmem-mmap .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \ ${MACHINE_ARCH} == "sparc64") && \ - (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ - ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux") + ((${OPSYS} == "NetBSD" && ${X11_TYPE} == "modular") || \ + ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ + ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux") PKG_SUPPORTED_OPTIONS+= dri .endif ### @@ -57,7 +58,7 @@ PKG_SUPPORTED_OPTIONS+= dri ### is advised given that it's glx/glcore modules are built from ### Mesa 6.5.3 (a development release). ### -.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*) +.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*) && ${X11_TYPE} == "modular" PKG_SUGGESTED_OPTIONS+= dri .endif |