Module Name: src
Committed By: snj
Date: Fri Dec 23 08:04:05 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-7]: Makefile.ximcp
Makefile.xlcDef Makefile.xlcUTF8Load Makefile.xlibi18n
Makefile.xomGeneric
src/external/mit/xorg/lib/libX11/static [netbsd-7]: Makefile
src/external/mit/xorg/lib/libX11/ximcp [netbsd-7]: Makefile
src/external/mit/xorg/lib/libX11/xlcDef [netbsd-7]: Makefile
src/external/mit/xorg/lib/libX11/xlcUTF8Load [netbsd-7]: Makefile
src/external/mit/xorg/lib/libX11/xlibi18n [netbsd-7]: Makefile
src/external/mit/xorg/lib/libX11/xomGeneric [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1336):
external/mit/xorg/lib/libX11/Makefile.xlibi18n: revision 1.2
external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile: revision 1.2
external/mit/xorg/lib/libX11/xlcDef/Makefile: revision 1.2
external/mit/xorg/lib/libX11/Makefile.xomGeneric: revision 1.2
external/mit/xorg/lib/libX11/xomGeneric/Makefile: revision 1.2
external/mit/xorg/lib/libX11/Makefile.xlcDef: revision 1.2
external/mit/xorg/lib/libX11/xlibi18n/Makefile: revision 1.2
external/mit/xorg/lib/libX11/ximcp/Makefile: revision 1.4
external/mit/xorg/lib/libX11/static/Makefile: revision 1.3
external/mit/xorg/lib/libX11/Makefile.ximcp: revision 1.3
external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load: revision 1.2
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.40.1 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.1 -r1.1.42.1 \
src/external/mit/xorg/lib/libX11/Makefile.xlcDef \
src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n \
src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
cvs rdiff -u -r1.2 -r1.2.20.1 \
src/external/mit/xorg/lib/libX11/static/Makefile
cvs rdiff -u -r1.3 -r1.3.6.1 src/external/mit/xorg/lib/libX11/ximcp/Makefile
cvs rdiff -u -r1.1 -r1.1.42.1 \
src/external/mit/xorg/lib/libX11/xlcDef/Makefile
cvs rdiff -u -r1.1 -r1.1.42.1 \
src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
cvs rdiff -u -r1.1 -r1.1.42.1 \
src/external/mit/xorg/lib/libX11/xlibi18n/Makefile
cvs rdiff -u -r1.1 -r1.1.42.1 \
src/external/mit/xorg/lib/libX11/xomGeneric/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/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2.40.1
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 Mon Oct 6 16:24:33 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
+# $NetBSD: Makefile.ximcp,v 1.2.40.1 2016/12/23 08:04:04 snj Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -43,5 +43,3 @@ CPPFLAGS.imDefLkup.c= -Wno-error
CPPFLAGS.imRm.c= -Wno-error
CPPFLAGS.imTrans.c= -Wno-error
CPPFLAGS.imLcLkup.c= -Wno-stack-protector
-
-.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcDef
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1.42.1
--- src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcDef Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcDef,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcDef,v 1.1.42.1 2016/12/23 08:04:04 snj Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/def
SRCS.xlcDef= lcDefConv.c
@@ -9,5 +9,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1.42.1
--- src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcUTF8Load,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcUTF8Load,v 1.1.42.1 2016/12/23 08:04:04 snj Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/Utf8
@@ -11,5 +11,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1.42.1
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.1.42.1 2016/12/23 08:04:04 snj Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -10,5 +10,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
-
-.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
diff -u src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1.42.1
--- src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xomGeneric Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xomGeneric,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xomGeneric,v 1.1.42.1 2016/12/23 08:04:04 snj Exp $
.PATH: ${X11SRCDIR.X11}/modules/om/generic
@@ -19,5 +19,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/static/Makefile
diff -u src/external/mit/xorg/lib/libX11/static/Makefile:1.2 src/external/mit/xorg/lib/libX11/static/Makefile:1.2.20.1
--- src/external/mit/xorg/lib/libX11/static/Makefile:1.2 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libX11/static/Makefile Fri Dec 23 08:04:04 2016
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.2.20.1 2016/12/23 08:04:04 snj 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 \
Index: src/external/mit/xorg/lib/libX11/ximcp/Makefile
diff -u src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.3 src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.3.6.1
--- src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.3 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/lib/libX11/ximcp/Makefile Fri Dec 23 08:04:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.3.6.1 2016/12/23 08:04:04 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -15,3 +15,4 @@ CFLAGS+=-I${X11SRCDIR.X11}/src
CWARNFLAGS.clang+= -Wno-unused
.include "../Makefile.ximcp"
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/xlcDef/Makefile
diff -u src/external/mit/xorg/lib/libX11/xlcDef/Makefile:1.1 src/external/mit/xorg/lib/libX11/xlcDef/Makefile:1.1.42.1
--- src/external/mit/xorg/lib/libX11/xlcDef/Makefile:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/xlcDef/Makefile Fri Dec 23 08:04:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.1.42.1 2016/12/23 08:04:05 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common
SRCS= ${SRCS.xlcDef}
.include "../Makefile.xlcDef"
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
diff -u src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile:1.1 src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile:1.1.42.1
--- src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile Fri Dec 23 08:04:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.1.42.1 2016/12/23 08:04:05 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common
SRCS= ${SRCS.xlcUTF8Load}
.include "../Makefile.xlcUTF8Load"
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/xlibi18n/Makefile
diff -u src/external/mit/xorg/lib/libX11/xlibi18n/Makefile:1.1 src/external/mit/xorg/lib/libX11/xlibi18n/Makefile:1.1.42.1
--- src/external/mit/xorg/lib/libX11/xlibi18n/Makefile:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/xlibi18n/Makefile Fri Dec 23 08:04:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.1.42.1 2016/12/23 08:04:05 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common
SRCS= ${SRCS.xlibi18n}
.include "../Makefile.xlibi18n"
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/xomGeneric/Makefile
diff -u src/external/mit/xorg/lib/libX11/xomGeneric/Makefile:1.1 src/external/mit/xorg/lib/libX11/xomGeneric/Makefile:1.1.42.1
--- src/external/mit/xorg/lib/libX11/xomGeneric/Makefile:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/xomGeneric/Makefile Fri Dec 23 08:04:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile,v 1.1.42.1 2016/12/23 08:04:05 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common
SRCS= ${SRCS.xomGeneric}
.include "../Makefile.xomGeneric"
+.include <bsd.lib.mk>
