pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/harfbuzz Include mk file earlier to enable rust ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c6e76c90f46
branches:  trunk
changeset: 396562:3c6e76c90f46
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Jun 03 12:27:48 2019 +0000

description:
Include mk file earlier to enable rust conditional

diffstat:

 fonts/harfbuzz/Makefile      |  5 ++---
 fonts/harfbuzz/buildlink3.mk |  7 ++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 08fb98b0b708 -r 3c6e76c90f46 fonts/harfbuzz/Makefile
--- a/fonts/harfbuzz/Makefile   Mon Jun 03 12:21:56 2019 +0000
+++ b/fonts/harfbuzz/Makefile   Mon Jun 03 12:27:48 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2019/06/02 03:11:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.113 2019/06/03 12:27:48 ryoon Exp $
 
 DISTNAME=      harfbuzz-2.4.0
 PKGREVISION=   3
@@ -15,6 +15,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=           graphite2
+.include "../../lang/rust/platform.mk"
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
@@ -61,8 +62,6 @@
 .  endif
 .endif
 
-.include "../../lang/rust/platform.mk"
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #cairo is only needed for the hb-view command line utility
diff -r 08fb98b0b708 -r 3c6e76c90f46 fonts/harfbuzz/buildlink3.mk
--- a/fonts/harfbuzz/buildlink3.mk      Mon Jun 03 12:21:56 2019 +0000
+++ b/fonts/harfbuzz/buildlink3.mk      Mon Jun 03 12:27:48 2019 +0000
@@ -1,16 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/11/12 03:49:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/06/03 12:27:48 ryoon Exp $
 
 BUILDLINK_TREE+=       harfbuzz
 
 .if !defined(HARFBUZZ_BUILDLINK3_MK)
 HARFBUZZ_BUILDLINK3_MK:=
 
+.include "../../lang/rust/platform.mk"
+
 BUILDLINK_API_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
 BUILDLINK_ABI_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
 BUILDLINK_PKGSRCDIR.harfbuzz?=         ../../fonts/harfbuzz
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.include "../../graphics/graphite2/buildlink3.mk"
+.endif
 .endif # HARFBUZZ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -harfbuzz



Home | Main Index | Thread Index | Old Index