Module Name: src
Committed By: macallan
Date: Sat Nov 10 01:38:02 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
build Xorg with nv and wsfb drivers on iyonix
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.45 -r1.46 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.95 src/external/mit/xorg/server/drivers/Makefile:1.96
--- src/external/mit/xorg/server/drivers/Makefile:1.95 Sat Dec 23 10:15:52 2017
+++ src/external/mit/xorg/server/drivers/Makefile Sat Nov 10 01:38:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2017/12/23 10:15:52 nakayama Exp $
+# $NetBSD: Makefile,v 1.96 2018/11/10 01:38:02 macallan Exp $
.include <bsd.own.mk>
@@ -212,6 +212,12 @@ SUBDIR+= \
xf86-video-s3
.endif # ${MACHINE} == "ibmnws"
+.if ${MACHINE} == "iyonix"
+SUBDIR+= \
+ xf86-video-nv \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "iyonix"
+
.if ${MACHINE} == "luna68k"
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.46
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45 Tue Aug 16 19:09:48 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sat Nov 10 01:38:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/08/16 19:09:48 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2018/11/10 01:38:02 macallan Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -71,6 +71,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
.if ${MACHINE} == "cats" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "hpcarm" || \
+ ${MACHINE} == "iyonix" || \
${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "zaurus"
