[lmi-commits] (no subject)

[Greg Chicares]

branch: master
commit 1d5502d55d9f895468b7f0d1ba7d9601980eb30c
Author: Gregory W. Chicares <address@hidden>
Date:   Fri Jul 15 13:15:05 2016 +0000

    Upgrade libxml2 and libxslt
    
    This step upgrades both libraries to the 2016-05 (current) release.
    Forthcoming steps will remove '--without-threads' and '--without-zlib'.
---
 install_libxml2_libxslt.make |   29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 89a9c80..19ede30 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -23,16 +23,12 @@
 
 # Archives and their md5sums
 
-libxml2_version = libxml2-2.6.26
-libxslt_version = libxslt-1.1.17
-#libxml2_version = libxml2-2.9.4
-#libxslt_version = libxslt-1.1.29
+libxml2_version = libxml2-2.9.4
+libxslt_version = libxslt-1.1.29
 
 libxml2_archive := $(libxml2_version).tar.gz
 libxslt_archive := $(libxslt_version).tar.gz
 
-libxml2-2.6.26.tar.gz-md5 := 2d8d3805041edab967368b497642f981
-libxslt-1.1.17.tar.gz-md5 := fde6a7a93c0eb14cba628692fa3a1000
 libxml2-2.9.4.tar.gz-md5  := ae249165c173b1ff386ee8ad676815f5
 libxslt-1.1.29.tar.gz-md5 := a129d3c44c022de3b9dcf6d6f288d72e
 
@@ -51,12 +47,6 @@ $(libxslt_version): $(libxml2_version)
 host          := ftp://xmlsoft.org
 host_path     := libxml2
 
-# Expunge this soon.
-libxml2-2.6.26.tar.gz: host := ftp://ftp.gnome.org
-libxslt-1.1.17.tar.gz: host := ftp://ftp.gnome.org
-libxml2-2.6.26.tar.gz: host_path := pub/GNOME/sources/libxml2/2.6
-libxslt-1.1.17.tar.gz: host_path := pub/GNOME/sources/libxslt/1.1
-
 mingw_dir     := /MinGW_
 
 prefix        := /opt/lmi/local
@@ -101,15 +91,9 @@ common_options := \
     STRIP='$(mingw_bin_dir)/strip' \
   WINDRES='$(mingw_bin_dir)/windres' \
 
-$(libxml2_version)_options := \
-  $(common_options) \
-  --with-schemas \
-  --without-iconv \
-  --without-modules \
-  --without-schematron \
+# Expunge '--without-threads' and '--without-zlib' soon.
 
-# Expunge this workaround soon.
-libxml2-2.6.26: $(libxml2_version)_options := \
+$(libxml2_version)_options := \
   $(common_options) \
   --with-schemas \
   --without-iconv \
@@ -152,13 +136,12 @@ initial_setup:
        $(MKDIR) --parents $(cache_dir)
        $(MKDIR) --parents $(xml_dir)
 
-# Expunge old versions, then restore these two assignments: s/=/:=/
-WGETFLAGS = \
+WGETFLAGS := \
   --cut-dirs=$(words $(subst /, ,$(host_path))) \
   --force-directories \
   --no-host-directories \
 
-wget_whence = $(host)/$(host_path)
+wget_whence := $(host)/$(host_path)
 
 TARFLAGS := --keep-old-files
 %.tar.bz2: TARFLAGS += --bzip2