diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2021-05-25 14:49:35 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2021-05-25 14:49:35 +0000 |
| commit | c4eeb50120475d2014c13fed121721c03d49af0a (patch) | |
| tree | f88c7ca36e3e669b2de41ad2dc23048b3ef05d9a | |
| parent | ce7b6d3d4865e5878bd89e544dde83e719cd84af (diff) | |
| download | pkgsrc-c4eeb50120475d2014c13fed121721c03d49af0a.tar.gz | |
Pullup ticket #6459 - requested by nia
textproc/libxslt: build fix
Revisions pulled up:
- textproc/libxslt/distinfo 1.66
- textproc/libxslt/patches/patch-configure 1.3
---
Module Name: pkgsrc
Committed By: mcf
Date: Mon May 24 04:18:19 UTC 2021
Modified Files:
pkgsrc/textproc/libxslt: distinfo
Added Files:
pkgsrc/textproc/libxslt/patches: patch-configure
Log Message:
libxslt: fix libxml2 detection with libxml2 >= 2.9.11
xml2-config from libxml2 >= 2.9.11 now exits with non-zero status
for invalid arguments. libxslt called xml2-config with the invalid
`print` option to probe for its existence, so with new libxml2 it
now skipped detection via xml2-config entirely causing a build
failure.
Apply upstream patch to correct this invalid xml2-config usage.
| -rw-r--r-- | textproc/libxslt/distinfo | 3 | ||||
| -rw-r--r-- | textproc/libxslt/patches/patch-configure | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 145d85f34d4..017b2856878 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.65 2019/11/06 13:23:45 wiz Exp $ +$NetBSD: distinfo,v 1.65.12.1 2021/05/25 14:49:35 bsiegert Exp $ SHA1 (libxslt-1.1.34.tar.gz) = 5b42a1166a1688207028e4a5e72090828dd2a61e RMD160 (libxslt-1.1.34.tar.gz) = 46a5d1ac1524ad685447cec71c0f8313d727f0af SHA512 (libxslt-1.1.34.tar.gz) = 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b Size (libxslt-1.1.34.tar.gz) = 3552258 bytes +SHA1 (patch-configure) = a63c214c7f5e4c4f89307c18519240372382c2fa SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52 diff --git a/textproc/libxslt/patches/patch-configure b/textproc/libxslt/patches/patch-configure new file mode 100644 index 00000000000..92a6717b8ad --- /dev/null +++ b/textproc/libxslt/patches/patch-configure @@ -0,0 +1,17 @@ +$NetBSD: patch-configure,v 1.3.2.2 2021/05/25 14:49:35 bsiegert Exp $ + +Fix incorrect xml2-config usage. + +Upstream: https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc + +--- configure.orig Mon May 24 04:04:05 2021 ++++ configure +@@ -14860,7 +14860,7 @@ PKG_CONFIG=$_save_PKG_CONFIG + fi + + +-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 ++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml libraries >= $LIBXML_REQUIRED_VERSION" >&5 + $as_echo_n "checking for libxml libraries >= $LIBXML_REQUIRED_VERSION... " >&6; } |