Mon Jan 25 18:00:26 2016 UTC ()
Include <bsd.own.mk> before setting any MK variables, so that /etc/mk.conf
is processed first, and it's settings don't override ours.


(christos)
diff -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs diff -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/Makefile.serverlib (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib 2015/07/18 08:56:06 1.8
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib 2016/01/25 18:00:26 1.9
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile.serverlib,v 1.8 2015/07/18 08:56:06 mrg Exp $ 1# $NetBSD: Makefile.serverlib,v 1.9 2016/01/25 18:00:26 christos Exp $
 2
 3.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
2 4
3# We can't use LIBISPRIVATE here as we need the ".so" installed. 5# We can't use LIBISPRIVATE here as we need the ".so" installed.
4MKPICINSTALL:= no 6MKPICINSTALL:= no
5MKLINT:= no 7MKLINT:= no
6MKDEBUGLIB:= no 8MKDEBUGLIB:= no
7MKPROFILE:= no 9MKPROFILE:= no
8 10
9.include <bsd.own.mk> # for NETBSDSRCDIR 
10.include <bsd.endian.mk> 11.include <bsd.endian.mk>
11 12
12.if ${TARGET_ENDIANNESS} == "1234" 13.if ${TARGET_ENDIANNESS} == "1234"
13X_BYTE_ORDER=X_LITTLE_ENDIAN 14X_BYTE_ORDER=X_LITTLE_ENDIAN
14.elif ${TARGET_ENDIANNESS} == "4321" 15.elif ${TARGET_ENDIANNESS} == "4321"
15X_BYTE_ORDER=X_BIG_ENDIAN 16X_BYTE_ORDER=X_BIG_ENDIAN
16.else 17.else
17X_BYTE_ORDER=0 18X_BYTE_ORDER=0
18.endif 19.endif
19 20
20CPPFLAGS+= ${X11FLAGS.SERVER} 21CPPFLAGS+= ${X11FLAGS.SERVER}
21CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} 22CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
22 23
23.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") 24.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
24CPPFLAGS+= -D__GLX_ALIGN64 25CPPFLAGS+= -D__GLX_ALIGN64
25.endif 26.endif
cvs diff -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server/Makefile.servermod (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/Makefile.servermod 2015/07/18 08:56:06 1.3
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod 2016/01/25 18:00:26 1.4
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile.servermod,v 1.3 2015/07/18 08:56:06 mrg Exp $ 1# $NetBSD: Makefile.servermod,v 1.4 2016/01/25 18:00:26 christos Exp $
 2
 3.include <bsd.own.mk> # For /etc/mk.conf processing
2 4
3.if defined(XMODULEDIR) 5.if defined(XMODULEDIR)
4SHLIB_MAJOR=0 6SHLIB_MAJOR=0
5 7
6# dri, dri2 and fb need to be linked statically as well? 8# dri, dri2 and fb need to be linked statically as well?
7.if !defined(XMODULEDIRANDSTATIC) 9.if !defined(XMODULEDIRANDSTATIC)
8MKSTATICLIB:= no 10MKSTATICLIB:= no
9.endif 11.endif
10 12
11.else 13.else
12 14
13# if these aren't defined the module being built is not installed 15# if these aren't defined the module being built is not installed
14# instead it is statically linked into the xserver 16# instead it is statically linked into the xserver
15libinstall:: 17libinstall::
16moduleinstall:: 18moduleinstall::
17 19
18.endif 20.endif
19 21
20# x11 modules that are installed need the X11FLAGS.LOADABLE's defined 22# x11 modules that are installed need the X11FLAGS.LOADABLE's defined
21.if defined(XMODULEDIR) 23.if defined(XMODULEDIR)
22CPPFLAGS+= ${X11FLAGS.LOADABLE} 24CPPFLAGS+= ${X11FLAGS.LOADABLE}
23.endif 25.endif