Module Name: src Committed By: mrg Date: Thu Jun 2 22:41:27 UTC 2016
Modified Files: src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlcDef Makefile.xlcUTF8Load Makefile.xlibi18n Makefile.xomGeneric src/external/mit/xorg/lib/libX11/static: Makefile src/external/mit/xorg/lib/libX11/ximcp: Makefile src/external/mit/xorg/lib/libX11/xlcDef: Makefile src/external/mit/xorg/lib/libX11/xlcUTF8Load: Makefile src/external/mit/xorg/lib/libX11/xlibi18n: Makefile src/external/mit/xorg/lib/libX11/xomGeneric: Makefile Log Message: 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.3 src/external/mit/xorg/lib/libX11/Makefile.ximcp cvs rdiff -u -r1.1 -r1.2 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.3 src/external/mit/xorg/lib/libX11/static/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/ximcp/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlcDef/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlibi18n/Makefile cvs rdiff -u -r1.1 -r1.2 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.