[src/trunk]: src/external/mit/xorg/lib build libutil_ul and link it into font...

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

details:   https://anonhg.NetBSD.org/src/rev/94ab56eec4f7
branches:  trunk
changeset: 449434:94ab56eec4f7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Mar 07 03:56:15 2019 +0000

description:
build libutil_ul and link it into fontconfig.  this should not change
the output as no functions will be consumed by fontconfig yet, but
will be used in an update shortly.

diffstat:

 external/mit/xorg/lib/Makefile                |  4 ++--
 external/mit/xorg/lib/fontconfig/src/Makefile |  8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 87b820b4261a -r 94ab56eec4f7 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Thu Mar 07 03:53:51 2019 +0000
+++ b/external/mit/xorg/lib/Makefile    Thu Mar 07 03:56:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2018/03/11 09:43:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.43 2019/03/07 03:56:15 mrg Exp $
 
 # build libraries for xorg
 
@@ -16,7 +16,7 @@
 .if !defined(MLIBDIR)
 SUBDIR+=xkeyboard-config
 .endif
-SUBDIR+=libxcb \
+SUBDIR+=libxcb ../../../bsd/libuuid_ul/lib/libuuid_ul \
        .WAIT
 .if !defined(MLIBDIR)
 SUBDIR+=dri7 dri gallium
diff -r 87b820b4261a -r 94ab56eec4f7 external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Mar 07 03:53:51 2019 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Mar 07 03:56:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2018/05/09 08:15:09 mrg Exp $
+#      $NetBSD: Makefile,v 1.22 2019/03/07 03:56:15 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -132,6 +132,12 @@
            s,@BASECONFIGDIR@,/etc/fonts,; \
            s,@fc_cachedir@,${FONTCONFIG_PATH},"
 
+LIBUUID_DIST=  ${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul
+.include "${LIBUUID_DIST}/libuuid_ul-rename.mk"
+LIBUUID_ULDIR!=        cd ${LIBUUID_DIST} && ${PRINTOBJDIR}
+LDADD+=                ${LIBUUID_ULDIR}/libuuid_ul.a
+DPADD+=                ${LIBUUID_ULDIR}/libuuid_ul.a
+
 # XXX
 CPPFLAGS.fcxml.c=      -Wno-error