Module Name: src
Committed By: christos
Date: Tue May 1 17:42:01 UTC 2018
Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/makekeys: Makefile
src/external/mit/xorg/tools/makestrs: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
src/external/mit/xorg/tools/ucs2any: Makefile
Added Files:
src/external/mit/xorg/tools: Makefile.inc
Log Message:
Apply the same fixes from the regular tools dir:
PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might
not support the necessary options. This is done thusly:
1. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that
include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc
first. This will also allow us to control other tools options from a
single location if we need to.
2. Centralize NOMAN handling.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/tools/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/bdftopcf/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/ucs2any/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.7 src/external/mit/xorg/tools/bdftopcf/Makefile:1.8
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.7 Sun Mar 11 07:01:07 2018
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Tue May 1 13:42:00 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/03/11 11:01:07 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROG= bdftopcf
.PATH: ${X11SRCDIR.bdftopcf}
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.11 src/external/mit/xorg/tools/fc-cache/Makefile:1.12
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.11 Tue Aug 29 05:02:10 2017
+++ src/external/mit/xorg/tools/fc-cache/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2017/08/29 09:02:10 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROG= fc-cache
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.5 src/external/mit/xorg/tools/makekeys/Makefile:1.6
--- src/external/mit/xorg/tools/makekeys/Makefile:1.5 Wed Mar 14 19:41:05 2018
+++ src/external/mit/xorg/tools/makekeys/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.PATH: ${X11SRCDIR.X11}/src/util
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.4 src/external/mit/xorg/tools/makestrs/Makefile:1.5
--- src/external/mit/xorg/tools/makestrs/Makefile:1.4 Wed Jun 24 18:20:26 2015
+++ src/external/mit/xorg/tools/makestrs/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/06/24 22:20:26 matt Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.PATH: ${X11SRCDIR.Xt}/util
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 src/external/mit/xorg/tools/mkfontscale/Makefile:1.9
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 Sun Feb 28 17:12:26 2016
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROG= mkfontscale
Index: src/external/mit/xorg/tools/ucs2any/Makefile
diff -u src/external/mit/xorg/tools/ucs2any/Makefile:1.2 src/external/mit/xorg/tools/ucs2any/Makefile:1.3
--- src/external/mit/xorg/tools/ucs2any/Makefile:1.2 Sat Sep 13 17:37:07 2008
+++ src/external/mit/xorg/tools/ucs2any/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 21:37:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROG= ucs2any
.PATH: ${X11SRCDIR.font-util}
Added files:
Index: src/external/mit/xorg/tools/Makefile.inc
diff -u /dev/null src/external/mit/xorg/tools/Makefile.inc:1.1
--- /dev/null Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/Makefile.inc Tue May 1 13:42:00 2018
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2018/05/01 17:42:00 christos Exp $
+
+NOINFO= # defined
+NOLINT= # defined
+NOMAN= # defined
+MKREPRO=no # Native toolchain might be unable to do it
