[src/trunk]: src/external/mit/xorg/lib/libX11 fix PR 48928: build the static...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7bb0d81a0480
branches:  trunk
changeset: 345632:7bb0d81a0480
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jun 02 22:41:26 2016 +0000

description:
fix PR 48928:  build the static libX11 properly.  pull in the
ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules
directly.

also, don't include bsd.lib.mk in the fragment parts for these
modules, but in the module build itself.  otherwise, bsd.lib.mk
is included before SRCS is complete and the build strangely
seems to miss parts listed.

tested using the example in the PR.

diffstat:

 external/mit/xorg/lib/libX11/Makefile.ximcp       |   4 +---
 external/mit/xorg/lib/libX11/Makefile.xlcDef      |   4 +---
 external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load |   4 +---
 external/mit/xorg/lib/libX11/Makefile.xlibi18n    |   4 +---
 external/mit/xorg/lib/libX11/Makefile.xomGeneric  |   4 +---
 external/mit/xorg/lib/libX11/static/Makefile      |  22 ++++++++++++----------
 external/mit/xorg/lib/libX11/ximcp/Makefile       |   3 ++-
 external/mit/xorg/lib/libX11/xlcDef/Makefile      |   3 ++-
 external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile |   3 ++-
 external/mit/xorg/lib/libX11/xlibi18n/Makefile    |   3 ++-
 external/mit/xorg/lib/libX11/xomGeneric/Makefile  |   3 ++-
 11 files changed, 27 insertions(+), 30 deletions(-)

diffs (181 lines):

diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/Makefile.ximcp
--- a/external/mit/xorg/lib/libX11/Makefile.ximcp       Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.ximcp       Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
+# $NetBSD: Makefile.ximcp,v 1.3 2016/06/02 22:41:26 mrg Exp $
 
 .PATH: ${X11SRCDIR.X11}/modules/im/ximcp
 SRCS.ximcp= \
@@ -43,5 +43,3 @@
 CPPFLAGS.imRm.c=       -Wno-error
 CPPFLAGS.imTrans.c=    -Wno-error
 CPPFLAGS.imLcLkup.c=   -Wno-stack-protector
-
-.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/Makefile.xlcDef
--- a/external/mit/xorg/lib/libX11/Makefile.xlcDef      Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.xlcDef      Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcDef,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcDef,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:         ${X11SRCDIR.X11}/modules/lc/def
 SRCS.xlcDef=   lcDefConv.c
@@ -9,5 +9,3 @@
 
 CPPFLAGS+= \
        -DHASXDMAUTH
-
-.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load
--- a/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcUTF8Load,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcUTF8Load,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH: ${X11SRCDIR.X11}/modules/lc/Utf8
 
@@ -11,5 +11,3 @@
 
 CPPFLAGS+= \
        -DHASXDMAUTH
-
-.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/Makefile.xlibi18n
--- a/external/mit/xorg/lib/libX11/Makefile.xlibi18n    Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.xlibi18n    Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:         ${X11SRCDIR.X11}/modules/lc/gen
 SRCS.xlibi18n= lcGenConv.c
@@ -10,5 +10,3 @@
 CPPFLAGS+= \
        ${XLOCALE.DEFINES} \
        -DHASXDMAUTH
-
-.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/Makefile.xomGeneric
--- a/external/mit/xorg/lib/libX11/Makefile.xomGeneric  Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.xomGeneric  Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xomGeneric,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xomGeneric,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:         ${X11SRCDIR.X11}/modules/om/generic
 
@@ -19,5 +19,3 @@
 
 CPPFLAGS+= \
        -DHASXDMAUTH
-
-.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/static/Makefile
--- a/external/mit/xorg/lib/libX11/static/Makefile      Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/static/Makefile      Thu Jun 02 22:41:26 2016 +0000
@@ -1,20 +1,22 @@
-#      $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2016/06/02 22:41:26 mrg Exp $
 
 NOPIC= 1
 
 .include <bsd.own.mk>
 
 .include "../Makefile.libx11"
+.include "../Makefile.ximcp"
+.include "../Makefile.xlcDef"
+.include "../Makefile.xlcUTF8Load"
+.include "../Makefile.xlibi18n"
+.include "../Makefile.xomGeneric"
 
-.if 0
-SRCS+= imCallbk.c imDefFlt.c imDefIc.c imDefIm.c imDefLkup.c imDispch.c \
-       imEvToWire.c imExten.c imImSw.c imInsClbk.c imInt.c imLcFlt.c \
-       imLcGIc.c imLcIc.c imLcIm.c imLcLkup.c imLcPrs.c imLcSIc.c imRm.c \
-       imRmAttr.c imThaiFlt.c imThaiIc.c imThaiIm.c imTrX.c imTrans.c \
-       imTransR.c lcEuc.c lcGenConv.c lcJis.c lcSjis.c lcUTF8Load.c \
-       omDefault.c omGeneric.c omImText.c omText.c omTextEsc.c omTextExt.c \
-       omTextPer.c omXChar.c
-.endif
+SRCS+= \
+       ${SRCS.ximcp} \
+       ${SRCS.xlcDef} \
+       ${SRCS.xlcUTF8Load} \
+       ${SRCS.xlibi18n} \
+       ${SRCS.xomGeneric}
 
 SRCS+= \
        XlcDL.c \
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/ximcp/Makefile
--- a/external/mit/xorg/lib/libX11/ximcp/Makefile       Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/ximcp/Makefile       Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/02 22:41:26 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   2 # XXX
@@ -15,3 +15,4 @@
 CWARNFLAGS.clang+=     -Wno-unused
 
 .include "../Makefile.ximcp"
+.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/xlcDef/Makefile
--- a/external/mit/xorg/lib/libX11/xlcDef/Makefile      Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/xlcDef/Makefile      Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   2 # XXX
@@ -12,3 +12,4 @@
 SRCS=  ${SRCS.xlcDef}
 
 .include "../Makefile.xlcDef"
+.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
--- a/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   2 # XXX
@@ -12,3 +12,4 @@
 SRCS=  ${SRCS.xlcUTF8Load}
 
 .include "../Makefile.xlcUTF8Load"
+.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/xlibi18n/Makefile
--- a/external/mit/xorg/lib/libX11/xlibi18n/Makefile    Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/xlibi18n/Makefile    Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/02 22:41:27 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   2 # XXX
@@ -12,3 +12,4 @@
 SRCS=  ${SRCS.xlibi18n}
 
 .include "../Makefile.xlibi18n"
+.include <bsd.lib.mk>
diff -r f55a252273ea -r 7bb0d81a0480 external/mit/xorg/lib/libX11/xomGeneric/Makefile
--- a/external/mit/xorg/lib/libX11/xomGeneric/Makefile  Thu Jun 02 21:40:51 2016 +0000
+++ b/external/mit/xorg/lib/libX11/xomGeneric/Makefile  Thu Jun 02 22:41:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/02 22:41:27 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   2 # XXX
@@ -12,3 +12,4 @@
 SRCS=  ${SRCS.xomGeneric}
 
 .include "../Makefile.xomGeneric"
+.include <bsd.lib.mk>