diff options
| author | tnn <tnn> | 2008-04-27 09:43:12 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-04-27 09:43:12 +0000 |
| commit | 671ea2edb4349e5df12939d67fed14d3144603c8 (patch) | |
| tree | 7eccf9f7f502658fb220eb1d272d07de0624fa04 | |
| parent | 3c7b034408f1688f737db9a64071145d664d8d3d (diff) | |
| download | pkgsrc-671ea2edb4349e5df12939d67fed14d3144603c8.tar.gz | |
The "pkgsrc-i386" target doesn't seem to work on SunOS, so for now fall back
to the "pkgsrc" target which is intended to be portable.
| -rw-r--r-- | graphics/Mesa/Makefile.lib | 14 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 8 |
2 files changed, 7 insertions, 15 deletions
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib index 9805d806e5c..54b6867a8b1 100644 --- a/graphics/Mesa/Makefile.lib +++ b/graphics/Mesa/Makefile.lib @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.lib,v 1.8 2008/04/26 20:38:49 tnn Exp $ +# $NetBSD: Makefile.lib,v 1.9 2008/04/27 09:43:12 tnn Exp $ # # This Makefile fragment is included by all packages that build libraries # from the Mesa sources. @@ -51,17 +51,7 @@ MESA_HZ= ${tmphz} ### ### XXX do we still want this? ### -.if ${OPSYS} == "SunOS" -. if ${MACHINE_ARCH} == "sparc" -. if !empty(PKGSRC_COMPILER:Msunpro) -BUILD_TARGET= sunos5 -. else -BUILD_TARGET= sunos5-gcc -. endif -. else -BUILD_TARGET?= pkgsrc -. endif -.elif ${OPSYS} == "Interix" +.if ${OPSYS} == "Interix" BUILD_TARGET= interix3 .else BUILD_TARGET?= pkgsrc diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index d53ebfbecdd..64e8c05d375 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2008/04/25 20:33:08 bjs Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/27 09:43:12 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap # Assembler code build configurations -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ + ${OPSYS} != "SunOS" PKG_SUPPORTED_OPTIONS+= ${MACHINE_ARCH} PKG_SUGGESTED_OPTIONS+= ${MACHINE_ARCH} .endif @@ -63,7 +64,8 @@ PKG_SUGGESTED_OPTIONS+= dri ### ### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much. ### -.if !empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64) +.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \ + ${OPSYS} != "SunOS" BUILD_TARGET_SUFFIX= -${MACHINE_ARCH} .else BUILD_TARGET_SUFFIX= # empty |