diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-20 15:05:02 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-17 19:40:15 +0200 |
| commit | 57b36dae236a333dea938da9eba67d1f9c6dbbcf (patch) | |
| tree | b5e7f2fe584a97ff78eef97e7ff37258b0f84b35 | |
| parent | 374df6dbce390d994e9c333ff35e6268e9fdbb17 (diff) | |
libxml2: upgrade to release 2.9.10
... which is, surprisingly enough, required to build the latest libxslt.
Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6)
Reviewed-on: https://gerrit.libreoffice.org/83347
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit e9dc4662d4ba3bde91407911f1bc1a7aa25fa0ce)
Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94378
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-android.patch | 2 | ||||
| -rw-r--r-- | external/libxml2/libxml2-config.patch.1 | 46 |
3 files changed, 13 insertions, 39 deletions
diff --git a/download.lst b/download.lst index f66de44cad97..8363d9c6533c 100644 --- a/download.lst +++ b/download.lst @@ -178,8 +178,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4 export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz -export LIBXML_SHA256SUM := 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 -export LIBXML_VERSION_MICRO := 9 +export LIBXML_SHA256SUM := aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +export LIBXML_VERSION_MICRO := 10 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LIBXSLT_SHA256SUM := 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8 export LIBXSLT_VERSION_MICRO := 33 diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch index 714de61068fb..42af83274026 100644 --- a/external/libxml2/libxml2-android.patch +++ b/external/libxml2/libxml2-android.patch @@ -4,7 +4,7 @@ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ +-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) \ config.h install-binPROGRAMS: install-libLTLIBRARIES diff --git a/external/libxml2/libxml2-config.patch.1 b/external/libxml2/libxml2-config.patch.1 index 7d96fb530e57..8c28fb6a7806 100644 --- a/external/libxml2/libxml2-config.patch.1 +++ b/external/libxml2/libxml2-config.patch.1 @@ -25,45 +25,19 @@ Hack the xml2-config to return paths into WORKDIR. ;; --cflags) -- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ -+ echo -I${includedir} -+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ +- cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@" ++ #cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@" ++ cflags="-I${includedir}" ;; --libtool-libs) -@@ -82,19 +88,24 @@ - ;; +@@ -91,7 +96,8 @@ + libs="@XML_LIBDIR@ $libs" + fi - --libs) -- if [ "`uname`" = "Linux" ] -- then -- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -- then -- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ -- else -- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ -- fi -- else -- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ -- fi -+ echo -L${libdir} -lxml2 -lm -+# if [ "`uname`" = "Linux" ] -+# then -+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -+# then -+# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ -+# else -+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ -+# fi -+# else -+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ -+# fi - ;; +- libs="$libs @WIN32_EXTRA_LIBADD@" ++ #libs="$libs @WIN32_EXTRA_LIBADD@" ++ libs="-L${libdir} -lxml2 -lm" + ;; -+ print) # ugly configure hack -+ exit 0 -+ ;; -+ *) - usage - exit 1 |