changeset 6351:918354a364a5

Update expat to 2.1.0 avoid libexpat version conflict when input/regression/musicxml/ tests
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Sat, 21 Feb 2015 18:22:27 +0900
parents d1f3243f97bf
children 131a9c31d93e
files gub/specs/expat.py
diffstat 1 files changed, 1 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/expat.py	Sat Feb 21 01:24:15 2015 +0900
+++ b/gub/specs/expat.py	Sat Feb 21 18:22:27 2015 +0900
@@ -4,26 +4,8 @@
 from gub import tools
 
 class Expat (target.AutoBuild):
-    source = 'http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz'
-    patches = ['expat-2.0.1-mingw.patch']
+    source = 'http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz'
     dependencies = ['libtool', 'tools::expat']
-    make_flags = misc.join_lines ('''
-CFLAGS='-O2 -DHAVE_EXPAT_CONFIG_H'
-EXEEXT=
-RUN_FC_CACHE_TEST=false
-''')
-    if 'stat' in misc.librestrict (): # 40 lines of sh code from 1993 implementing `mkdir -p', statting components of DESTDIR: /home, ...
-        make_flags = make_flags + ''' 'mkinstalldirs=mkdir -p' '''
-    def patch (self):
-        target.AutoBuild.patch (self)
-        #FIXME: should have configure.ac/in vs configure timestamp test
-        self.system ('rm %(srcdir)s/configure')
-        self.system ('touch %(srcdir)s/tests/xmltest.sh.in')
-
-class Expat__mingw (Expat):
-    # mingw's expat libtool build breaks with DASH
-    configure_variables = (Expat.configure_variables
-                .replace ('SHELL=', 'XSHELL='))
 
 class Expat__linux__arm__vfp (Expat):
     patches = []