[Libreoffice-commits] core.git: external/redland

[Stephan Bergmann]

 external/redland/UnpackedTarball_raptor.mk |    1 +
 external/redland/raptor/xml2-config.patch  |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit a20d5dedc3ad04ce8a7a1413554b78b2777c349d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 15 10:00:35 2016 +0100

    external/redland: Defend against Yocto's broken xml2-config
    
    ...which is hard-coded to fail with
    
      echo '--should-not-have-used-/usr/bin/xml2-config'
      exit 1
    
    Change-Id: Ic358e7d494f01f67c1469c4add080d775525ebb6

diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index 752b41c..5d4eff7 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
 	external/redland/raptor/ubsan.patch \
 	$(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \
+	external/redland/raptor/xml2-config.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/xml2-config.patch b/external/redland/raptor/xml2-config.patch
new file mode 100644
index 0000000..61520a8
--- /dev/null
+++ b/external/redland/raptor/xml2-config.patch
@@ -0,0 +1,14 @@
+--- configure
++++ configure
+@@ -14197,6 +14197,11 @@
+   test -n "$XML_CONFIG" && break
+ done
+ 
++    if test -n "$XML_CONFIG"; then
++      if ! "$XML_CONFIG" --version; then
++        XML_CONFIG=
++      fi
++    fi
+   fi
+ fi
+