diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-20 15:05:02 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-11-22 14:40:56 +0100 |
| commit | dc26eff7249318ca8ae245ae5fa61393e4433d64 (patch) | |
| tree | 1381724047872704a921cfed0011ba849561f158 | |
| parent | 1a02ab9354ac0bfc385e655fb1748278517b1778 (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/83427
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
| -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 1d050742084c..0180ed740a9f 100644 --- a/download.lst +++ b/download.lst @@ -94,8 +94,8 @@ export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 export LIBLANGTAG_TARBALL := aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 export LIBXMLSEC_TARBALL := ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz -export LIBXML_MD5SUM := c04a5a0a042eaa157e8e8c9eabe76bd6 -export LIBXML_VERSION_MICRO := 9 +export LIBXML_MD5SUM := 10942a1dc23137a8aa07f0639cbfece5 +export LIBXML_VERSION_MICRO := 10 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 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 7b2b7f604188..7ad61923ebee 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 |