Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/server/xorg-server follow upstream change ...
details: https://anonhg.NetBSD.org/src/rev/6291561577e8
branches: trunk
changeset: 349072:6291561577e8
user: snj <snj%NetBSD.org@localhost>
date: Tue Nov 22 10:34:57 2016 +0000
description:
follow upstream change from 2009: build xf86Init.c with the rest of the
common code.
remove not-reproducible-build-friendly goop that set a build date for
the the x server. the static date (which we've already been using) in
xf86Build.h does just fine, although all it really does is add one
useless line to the X log.
fix whitespace around OSVENDOR
diffstat:
external/mit/xorg/server/xorg-server/Makefile.Xserver | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile | 20 +--
external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile | 63 ----------
5 files changed, 9 insertions(+), 85 deletions(-)
diffs (169 lines):
diff -r 30dfcb1c86b1 -r 6291561577e8 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Nov 22 09:21:51 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Nov 22 10:34:57 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.19 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.20 2016/11/22 10:34:57 snj Exp $
.for _SL in \
mi \
@@ -40,7 +40,6 @@
hw/xfree86/dri2 \
hw/xfree86/dummy \
hw/xfree86/i2c \
- hw/xfree86/init \
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
diff -r 30dfcb1c86b1 -r 6291561577e8 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Nov 22 09:21:51 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Nov 22 10:34:57 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2016/11/22 10:34:57 snj Exp $
-SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
+SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xf86config \
diff -r 30dfcb1c86b1 -r 6291561577e8 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 22 09:21:51 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 22 10:34:57 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/22 10:34:57 snj Exp $
.include <bsd.own.mk>
@@ -31,7 +31,6 @@
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
-LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -121,7 +120,6 @@
${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
- ${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/common} \
${DPADD.hw/xfree86/loader} \
${DPADD.hw/xfree86/xf86config} \
diff -r 30dfcb1c86b1 -r 6291561577e8 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Nov 22 09:21:51 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Nov 22 10:34:57 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/11/21 08:43:49 snj Exp $
+# $NetBSD: Makefile,v 1.31 2016/11/22 10:34:57 snj Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@
SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
- xf86Option.c \
+ xf86Option.c xf86Init.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
@@ -29,18 +29,6 @@
SRCS.bus+= xf86sbusBus.c
.endif
-# Rebuild xf86Build.h on every make
-#
-CLEANFILES+= xf86Build.h
-xf86Build.h: .PHONY
- ${_MKTARGET_CREATE}
- echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET}
-
-# We don't use DPSRCS+=xf86Build.h because we don't want the entire
-# library to be rebuilt each time
-#
-xf86Init.c xf86Init.o: xf86Build.h
-
CLEANFILES+= xf86DefModeSet.c
xf86DefModeSet.c:
${_MKTARGET_CREATE}
@@ -111,7 +99,9 @@
CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfree86%xfree86.org@localhost"'
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
-DBUILDERADDR='"xorg%xorg.org@localhost"' \
- -DOSVENDOR='" The NetBSD Foundation, Inc."'
+ -DOSVENDOR='"The NetBSD Foundation, Inc."' \
+ -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"' \
+ -DDEFAULT_LIBRARY_PATH='"${X11USRLIBDIR}"'
CPPFLAGS.xf86Globals.c= -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
CPPFLAGS.xf86Configure.c= -DXF86CONFIGFILE='"xorg.conf"'
CPPFLAGS.xf86Config.c= -DDRIVERS='"${DRIVERS}"' \
diff -r 30dfcb1c86b1 -r 6291561577e8 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Tue Nov 22 09:21:51 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2016/11/22 06:51:14 snj Exp $
-
-.include <bsd.own.mk>
-
-.include "../../../Makefile.serverlib"
-.include "../../../Makefile.servermod"
-
-LIB= init
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
-SRCS= xf86Init.c
-
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
- -I${X11SRCDIR.xorg-server}/mfb \
- -I${X11SRCDIR.xorg-server}/mi \
- -I${X11SRCDIR.xorg-server}/include \
- -I${X11SRCDIR.xorg-server}/os \
- -I${X11SRCDIR.xorg-server}/Xext \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${DESTDIR}${X11INCDIR}/xorg \
- -I${X11SRCDIR.xorg-server}/Xi \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
- -I${X11SRCDIR.xorg-server}/hw/xfree86 \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
- -I${X11SRCDIR.xorg-server}/render \
- -I${X11SRCDIR.xorg-server}/randr \
- -I${X11SRCDIR.xorg-server}/../include \
- -I.
-
-CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
- ${X11FLAGS.DIX} \
- -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
- -D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
- -D__VENDORDWEBSUPPORT__='"http://wiki.X.Org";' \
- -DXVENDORNAME='"The X.Org Foundation"' \
- -DHAVE_XORG_CONFIG_H
-
-.if ${MACHINE_ARCH} == "i386"
-CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
-.endif
-
-.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
-CPPFLAGS+= -DPCVT_SUPPORT
-.endif
-
-CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
- -DBUILDERADDR='"xorg%xorg.org@localhost"' \
- -DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
- -DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"
-
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
Home |
Main Index |
Thread Index |
Old Index