Browse Source

Re-add libxml2 (v 2.9.1) again to avoid compilation problems.

livxml seems to often cause problems when cross-compiling on OS X, just look on StackOverflow. If you have a good solution on how we can avoid building libxml2 and only rely on the library shipped with Xcode, create a pull request!
Pascal Pfiffner 9 years ago
parent
commit
8e00048406
3 changed files with 9 additions and 4 deletions
  1. 3 2
      NOTICE.txt
  2. 1 0
      Redland-source/cross-compile-config.py
  3. 5 2
      Redland-source/cross-compile.py

+ 3 - 2
NOTICE.txt

@@ -3,5 +3,6 @@ developed at the Institute for Learning and Research Technology,
 University of Bristol, UK (http://www.bristol.ac.uk/).
 
 This product includes the Redland Objective-C bindings 
-(http://purl.org/net/kianga/latest/redland-objc) written by 
-Rene Puls (rpuls@kcore.de).
+(https://github.com/p2/Redland-ObjC/) originally written by
+Rene Puls (rpuls@kcore.de), currently maintained by Pascal
+Pfiffner (https://github.com/p2/).

+ 1 - 0
Redland-source/cross-compile-config.py

@@ -3,6 +3,7 @@
 ##
 
 SOURCES = [
+	'http://xmlsoft.org/sources/libxml2-2.9.1.tar.gz',
 	'http://download.librdf.org/source/raptor2-2.0.10.tar.gz',
 	'http://download.librdf.org/source/rasqal-0.9.30.tar.gz',
 	'http://download.librdf.org/source/redland-1.0.16.tar.gz',

+ 5 - 2
Redland-source/cross-compile.py

@@ -200,8 +200,11 @@ def download(url, directory=None, filename=None, force=False, nostatus=False):
 	meta = urlhandle.info()
 	
 	# start
-	filesize = int(meta.getheaders("Content-Length")[0])
-	print "-->  Downloading %s (%s KB)" % (filename, filesize / 1000)
+	contentlen = meta.getheaders("Content-Length")
+	filesize = int(contentlen[0]) if contentlen else None
+	print "-->  Downloading %s (%s KB)" % (filename, filesize / 1000 if filesize else "??")
+	if filesize is None:
+		nostatus = True
 	
 	loaded = 0
 	blocksize = 8192