Module Name: src
Committed By: mrg
Date: Wed Jun 12 21:35:30 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/server: Makefile
src/external/mit/xorg/server/xorg-server: Makefile Makefile.common
src/share/mk: bsd.own.mk
Log Message:
rename (new) xorg_drivers to xorg_server -- platforms that build the
actual Xorg server (aka "xfree86 server").
move the list of these platforms from xorg-server/Makefile.common to
bsd.own.mk, so that we can access it easily in distrib.
this should fix most of the current build failures.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/sets.subr
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/server/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.733 -r1.734 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.11 src/distrib/sets/mkvars.mk:1.12
--- src/distrib/sets/mkvars.mk:1.11 Mon Jun 10 05:04:00 2013
+++ src/distrib/sets/mkvars.mk Wed Jun 12 21:35:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.11 2013/06/10 05:04:00 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.12 2013/06/12 21:35:29 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -19,7 +19,7 @@ MKEXTRAVARS= \
MKSLJIT \
MKSOFTFLOAT \
MKXORG \
- MKXORG_DRIVERS \
+ MKXORG_SERVER \
X11FLAVOR \
USE_INET6 \
USE_KERBEROS \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.150 src/distrib/sets/sets.subr:1.151
--- src/distrib/sets/sets.subr:1.150 Mon Jun 10 05:04:00 2013
+++ src/distrib/sets/sets.subr Wed Jun 12 21:35:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
+# $NetBSD: sets.subr,v 1.151 2013/06/12 21:35:29 mrg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
+# # $NetBSD: sets.subr,v 1.151 2013/06/12 21:35:29 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -257,7 +257,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# tpm ${MKTPM} != no
# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
-# xorg_drivers ${MKXORG_DRIVERS} != no
+# xorg_server ${MKXORG_SERVER} != no
# yp ${MKYP} != no
# zfs ${MKZFS} != no
#
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.142 src/distrib/sets/lists/xcomp/mi:1.143
--- src/distrib/sets/lists/xcomp/mi:1.142 Mon Jun 10 05:04:00 2013
+++ src/distrib/sets/lists/xcomp/mi Wed Jun 12 21:35:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.142 2013/06/10 05:04:00 mrg Exp $
+# $NetBSD: mi,v 1.143 2013/06/12 21:35:30 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5934,7 +5934,7 @@
./usr/X11R7/include/xorg/xaarop.h -unknown- xorg
./usr/X11R7/include/xorg/xf1bpp.h -unknown- obsolete
./usr/X11R7/include/xorg/xf4bpp.h -unknown- obsolete
-./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg,xorg_drivers
+./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg,xorg_server
./usr/X11R7/include/xorg/xf86.h -unknown- xorg
./usr/X11R7/include/xorg/xf86Crtc.h -unknown- xorg
./usr/X11R7/include/xorg/xf86Cursor.h -unknown- xorg
@@ -6371,7 +6371,7 @@
./usr/X11R7/lib/pkgconfig/xkeyboard-config.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmuu.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_drivers
+./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_server
./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xp.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg
Index: src/external/mit/xorg/server/Makefile
diff -u src/external/mit/xorg/server/Makefile:1.7 src/external/mit/xorg/server/Makefile:1.8
--- src/external/mit/xorg/server/Makefile:1.7 Mon Jun 10 05:01:44 2013
+++ src/external/mit/xorg/server/Makefile Wed Jun 12 21:35:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/10 05:01:44 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/12 21:35:29 mrg Exp $
# Makefile for modular-xorg-server and drivers
@@ -7,7 +7,10 @@
.include "xorg-server/Makefile.common"
SUBDIR= xorg-server
-.if ${MKXORG_DRIVERS} != "no"
+
+# We only make drivers if we make the actual Xorg server,
+# as opposed to Xvfb and Xnest.
+.if ${MKXORG_SERVER} != "no"
SUBDIR+= drivers
.endif
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19 src/external/mit/xorg/server/xorg-server/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile Wed Jun 12 21:35:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/12 21:35:29 mrg Exp $
.include <bsd.own.mk>
@@ -10,21 +10,9 @@ SUBDIR.xfont=Xfont fontbase
SUBDIR.xfont=
.endif
-.if ${XSERVER_NEEDS_MIEXT} != "no"
-SUBDIR.miext=miext
-.else
-SUBDIR.miext=
-.endif
-
-.if ${XSERVER_HAS_IPLAN} != "no"
-SUBDIR.iplan=iplan2p4 iplan2p8
-.else
-SUBDIR.iplan=
-.endif
-
SUBDIR= doc include .WAIT
SUBDIR+= glx
-SUBDIR+= dix fb mi Xext ${SUBDIR.miext} os randr render
+SUBDIR+= dix fb mi Xext miext os randr render
SUBDIR+= Xi xkb xkbstubs dbe record xfixes
SUBDIR+= damageext composite config .WAIT
SUBDIR+= hw
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.25 src/external/mit/xorg/server/xorg-server/Makefile.common:1.26
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.25 Mon May 14 08:42:04 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Wed Jun 12 21:35:29 2013
@@ -1,42 +1,18 @@
-# $NetBSD: Makefile.common,v 1.25 2012/05/14 08:42:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.26 2013/06/12 21:35:29 mrg Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
# below for descriptions of each variable.
+.include <bsd.own.mk>
+
# XFree86 servers all need XFONT as well.
-.if \
- ${MACHINE} == "alpha" || \
- ${MACHINE} == "amd64" || \
- ${MACHINE} == "bebox" || \
- ${MACHINE} == "cats" || \
- ${MACHINE} == "dreamcast" || \
- ${MACHINE} == "ews4800mips" || \
- ${MACHINE} == "evbarm" || \
- ${MACHINE} == "evbmips" || \
- ${MACHINE} == "hp300" || \
- ${MACHINE} == "hpcarm" || \
- ${MACHINE} == "hpcmips" || \
- ${MACHINE} == "hpcsh" || \
- ${MACHINE} == "i386" || \
- ${MACHINE} == "luna68k" || \
- ${MACHINE} == "macppc" || \
- ${MACHINE} == "netwinder" || \
- ${MACHINE} == "newsmips" || \
- ${MACHINE} == "prep" || \
- ${MACHINE} == "ofppc" || \
- ${MACHINE} == "sgimips" || \
- ${MACHINE} == "shark" || \
- ${MACHINE} == "sparc" || \
- ${MACHINE} == "sparc64" || \
- ${MACHINE} == "vax" || \
- ${MACHINE} == "zaurus"
+.if ${MKXORG_SERVER} != "no"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
-
.if ${MACHINE} == "acorn32"
XSERVER_XARM32VIDC= yes
.endif
@@ -48,27 +24,20 @@ XSERVER_XDECNETBSD= yes
.if ${MACHINE} == "amiga"
XSERVER_XAMIGA= yes
-XSERVER_HAS_AFB= yes
.endif
.if ${MACHINE} == "atari"
-XSERVER_HAS_IPLAN?= yes
#XSERVER_XFREE68= yes
.endif
.if ${MACHINE} == "mac68k"
XSERVER_XMAC68K= yes
-XSERVER_HAS_CFB= yes
.endif
.if ${MACHINE} == "macppc"
XSERVER_XMACPPC= yes
.endif
-#.if ${MACHINE} == "newsmips"
-#XSERVER_XNEWSMIPS?= yes
-#.endif
-
.if ${MACHINE} == "pmax"
XSERVER_XDECNETBSD= yes
XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
@@ -92,16 +61,6 @@ XSERVER_X68K= yes
# Does this server need Xfont/fontbase libraries?
XSERVER_NEEDS_XFONT?= no
-# Does this server need miext modules?
-XSERVER_NEEDS_MIEXT?= yes
-# Does this server use cfb* libraries?
-XSERVER_HAS_CFB?= yes
-# Does this server use fb library?
-XSERVER_HAS_FB?= yes
-# Does this server use afb library?
-XSERVER_HAS_AFB?= no
-# Does this server use iplan2p? libraries?
-XSERVER_HAS_IPLAN?= no
# Does this platform build XFree86 X server?
XSERVER_XFREE86?= no
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.733 src/share/mk/bsd.own.mk:1.734
--- src/share/mk/bsd.own.mk:1.733 Mon Jun 10 05:02:38 2013
+++ src/share/mk/bsd.own.mk Wed Jun 12 21:35:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.733 2013/06/10 05:02:38 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.734 2013/06/12 21:35:29 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -925,11 +925,35 @@ X11FLAVOUR?= Xorg
# Which platforms build the xorg-server drivers (as opposed
# to just Xnest and Xvfb.)
#
-.if ${X11FLAVOUR} == "Xorg" && \
- ${MACHINE} == "acorn26"
-MKXORG_DRIVERS?=no
+.if ${X11FLAVOUR} == "Xorg" && \
+ ${MACHINE} == "alpha" || \
+ ${MACHINE} == "amd64" || \
+ ${MACHINE} == "bebox" || \
+ ${MACHINE} == "cats" || \
+ ${MACHINE} == "dreamcast" || \
+ ${MACHINE} == "ews4800mips" || \
+ ${MACHINE} == "evbarm" || \
+ ${MACHINE} == "evbmips" || \
+ ${MACHINE} == "hp300" || \
+ ${MACHINE} == "hpcarm" || \
+ ${MACHINE} == "hpcmips" || \
+ ${MACHINE} == "hpcsh" || \
+ ${MACHINE} == "i386" || \
+ ${MACHINE} == "luna68k" || \
+ ${MACHINE} == "macppc" || \
+ ${MACHINE} == "netwinder" || \
+ ${MACHINE} == "newsmips" || \
+ ${MACHINE} == "prep" || \
+ ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "sgimips" || \
+ ${MACHINE} == "shark" || \
+ ${MACHINE} == "sparc" || \
+ ${MACHINE} == "sparc64" || \
+ ${MACHINE} == "vax" || \
+ ${MACHINE} == "zaurus"
+MKXORG_SERVER?=yes
.else
-MKXORG_DRIVERS?=yes
+MKXORG_SERVER?=no
.endif
#
