Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Switch shark to Xorg server 1.18.



details:   https://anonhg.NetBSD.org/src/rev/870eb36cfa7a
branches:  trunk
changeset: 347579:870eb36cfa7a
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Sep 03 16:10:34 2016 +0000

description:
Switch shark to Xorg server 1.18.

The igs driver no longer builds against 1.10.

diffstat:

 share/mk/bsd.own.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 70b40076bc74 -r 870eb36cfa7a share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Sep 03 15:47:54 2016 +0000
+++ b/share/mk/bsd.own.mk       Sat Sep 03 16:10:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.951 2016/09/03 12:32:12 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.952 2016/09/03 16:10:34 jakllsch Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1399,7 +1399,11 @@
 .endfor
 
 # During transition from xorg-server 1.10 to 1.18
+.if ${MACHINE} == "shark"
+HAVE_XORG_SERVER_VER?=118
+.else
 HAVE_XORG_SERVER_VER?=110
+.endif
 
 .if ${HAVE_XORG_SERVER_VER} == "118"
 XORG_SERVER_SUBDIR?=xorg-server



Home | Main Index | Thread Index | Old Index