sync upstream patches
This commit is contained in:
parent
0bd0a5df2e
commit
39d8394d8d
18
LibXML.pm
18
LibXML.pm
|
@ -220,13 +220,17 @@ sub threads_shared_enabled {
|
|||
#-------------------------------------------------------------------------#
|
||||
# test exact version (up to patch-level) #
|
||||
#-------------------------------------------------------------------------#
|
||||
{
|
||||
my ($runtime_version) = LIBXML_RUNTIME_VERSION() =~ /^(\d+)/;
|
||||
if ( $runtime_version < LIBXML_VERSION ) {
|
||||
warn "Warning: XML::LibXML compiled against libxml2 ".LIBXML_VERSION.
|
||||
", but runtime libxml2 is older $runtime_version\n";
|
||||
}
|
||||
}
|
||||
#
|
||||
# disabled in Debian; cf. https://bugs.debian.org/783610 and
|
||||
# https://rt.cpan.org/Public/Bug/Display.html?id=104156
|
||||
#
|
||||
#{
|
||||
# my ($runtime_version) = LIBXML_RUNTIME_VERSION() =~ /^(\d+)/;
|
||||
# if ( $runtime_version < LIBXML_VERSION ) {
|
||||
# warn "Warning: XML::LibXML compiled against libxml2 ".LIBXML_VERSION.
|
||||
# ", but runtime libxml2 is older $runtime_version\n";
|
||||
# }
|
||||
#}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------#
|
||||
|
|
|
@ -223,7 +223,7 @@ unless ( $is_Win32 ) { # cannot get config in W32
|
|||
$libxml2_version = $1;
|
||||
}
|
||||
# 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors)
|
||||
exit 0 if !$FORCE and $libxml2_version ne "2.9.4";
|
||||
exit 1 if !$FORCE and $libxml2_version ne "2.9.4";
|
||||
}
|
||||
if ( $@ =~ /^UNTESTED (\S*)/ ) {
|
||||
warn "Note: libxml2 $1 was not tested with this XML::LibXML version.\n"
|
||||
|
|
|
@ -32,7 +32,7 @@ use XML::LibXML::Reader;
|
|||
# TEST
|
||||
SKIP:
|
||||
{
|
||||
if (XML::LibXML::LIBXML_VERSION() >= 20905)
|
||||
if (XML::LibXML::LIBXML_RUNTIME_VERSION() >= 20905)
|
||||
{
|
||||
skip 'libxml2 accepts empty strings since 2.9.5 version', 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue