Skip to content

Commit 8e00048

Browse files
committedOct 3, 2013
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!
1 parent 9f5e039 commit 8e00048

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed
 

‎NOTICE.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ developed at the Institute for Learning and Research Technology,
33
University of Bristol, UK (http://www.bristol.ac.uk/).
44

55
This product includes the Redland Objective-C bindings
6-
(http://purl.org/net/kianga/latest/redland-objc) written by
7-
Rene Puls (rpuls@kcore.de).
6+
(https://github.com/p2/Redland-ObjC/) originally written by
7+
Rene Puls (rpuls@kcore.de), currently maintained by Pascal
8+
Pfiffner (https://github.com/p2/).

‎Redland-source/cross-compile-config.py

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
##
44

55
SOURCES = [
6+
'http://xmlsoft.org/sources/libxml2-2.9.1.tar.gz',
67
'http://download.librdf.org/source/raptor2-2.0.10.tar.gz',
78
'http://download.librdf.org/source/rasqal-0.9.30.tar.gz',
89
'http://download.librdf.org/source/redland-1.0.16.tar.gz',

‎Redland-source/cross-compile.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,11 @@ def download(url, directory=None, filename=None, force=False, nostatus=False):
200200
meta = urlhandle.info()
201201

202202
# start
203-
filesize = int(meta.getheaders("Content-Length")[0])
204-
print "--> Downloading %s (%s KB)" % (filename, filesize / 1000)
203+
contentlen = meta.getheaders("Content-Length")
204+
filesize = int(contentlen[0]) if contentlen else None
205+
print "--> Downloading %s (%s KB)" % (filename, filesize / 1000 if filesize else "??")
206+
if filesize is None:
207+
nostatus = True
205208

206209
loaded = 0
207210
blocksize = 8192

0 commit comments

Comments
 (0)
Please sign in to comment.