pkgsrc-WIP-changes archive

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

libxml2-32: match PKGNAME.



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sun Jun 30 19:58:20 2019 +0300
Changeset:	588d05cd6daf8b5bd0293901c5882bb9f5aa7cf9

Modified Files:
	libxml2-32/buildlink3.mk

Log Message:
libxml2-32: match PKGNAME.

Requires the non-compat dependency too for headers!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=588d05cd6daf8b5bd0293901c5882bb9f5aa7cf9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxml2-32/buildlink3.mk | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diffs:
diff --git a/libxml2-32/buildlink3.mk b/libxml2-32/buildlink3.mk
index 40f431c9c6..60658c1404 100644
--- a/libxml2-32/buildlink3.mk
+++ b/libxml2-32/buildlink3.mk
@@ -1,23 +1,27 @@
 # $NetBSD: buildlink3.mk,v 1.18 2012/06/14 07:39:37 sbd Exp $
 
-BUILDLINK_TREE+=	libxml2
+BUILDLINK_TREE+=	compat32_libxml2
 
-.if !defined(LIBXML2_BUILDLINK3_MK)
-LIBXML2_BUILDLINK3_MK:=
+.if !defined(compat32_libxml2_BUILDLINK3_MK)
+compat32_libxml2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.2
-BUILDLINK_ABI_DEPENDS.libxml2+=	libxml2>=2.8.0nb2
-#BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
-BUILDLINK_PKGSRCDIR.libxml2?=	../libxml2-32/
-BUILDLINK_LIBDIRS.libxml2=	lib/32
+BUILDLINK_API_DEPENDS.compat32_libxml2+=	compat32_libxml2>=2.6.2
+BUILDLINK_ABI_DEPENDS.compat32_libxml2+=	compat32_libxml2>=2.8.0nb2
+#BUILDLINK_PKGSRCDIR.compat32_libxml2?=		../../textproc/compat32_libxml2
+BUILDLINK_PKGSRCDIR.compat32_libxml2?=		../../wip/libxml2-32/
+BUILDLINK_LIBDIRS.compat32_libxml2=		lib/32
 
-BUILDLINK_FILES.libxml2+=	bin/xml2-config
+BUILDLINK_FILES.compat32_libxml2+=		bin/xml2-config
 
 USE_FEATURES+=		glob
 
+# We need the non-compat version for headers.
+BUILDLINK_DEPMETHOD.libxml2+=	build
+.include "../../textproc/libxml2/buildlink3.mk"
+
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.endif # LIBXML2_BUILDLINK3_MK
+.endif # COMPAT32_LIBXML2_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-libxml2
+BUILDLINK_TREE+=	-compat32_libxml2


Home | Main Index | Thread Index | Old Index