diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-04 02:03:19 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-04 02:04:01 +0200 |
| commit | ca1ee8a68498087cf592d72c6e4806069a54d8a3 (patch) | |
| tree | 79d0ac0896530531c7e50002a6079032183c7254 /redland | |
| parent | ad700e1f6ea865e9733996589f7a8ae0ce74b708 (diff) | |
make sure to compile against SDK version of libxml/libxslt
might not be the most elegant solution, but should do the trick
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 10 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.libxml.patch | 13 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.libxslt.patch | 13 |
3 files changed, 34 insertions, 2 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 61d1e5a0ea9b..e0e4968be778 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_raptor .IF "$(SYSTEM_REDLAND)" == "YES" all: - @echo "An already available installation of Redland RDF should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of Redland RDF should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -66,6 +66,12 @@ OOO_PATCH_FILES += \ PATCH_FILES=$(OOO_PATCH_FILES) +.IF "$(SYSTEM_LIBXML)" == "YES" +PATCH_FILES+=raptor-1.4.18.libxml.patch +.ENDIF +.IF "$(SYSTEM_LIBXSLT)" == "YES" +PATCH_FILES+=raptor-1.4.18.libxslt.patch +.ENDIF .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch new file mode 100644 index 000000000000..d5627cdab06f --- /dev/null +++ b/redland/raptor/raptor-1.4.18.libxml.patch @@ -0,0 +1,13 @@ +--- misc/raptor-1.4.18/configure 2011-06-04 01:25:04.000000000 +0200 ++++ misc/build/raptor-1.4.18/configure 2011-06-04 01:24:57.000000000 +0200 +@@ -26447,8 +26447,8 @@ + CPPFLAGS="-I$srcdir/libxml $CPPFLAGS" + LIBS="$LIBS -Llibxml -llibxml" + else +- LIBS="$LIBS `$XML_CONFIG --libs`" +- CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS" ++ LIBS="$LIBS $LIBXML_LIBS" ++ CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" + fi + RAPTOR_XML_PARSER=libxml + fi diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch new file mode 100644 index 000000000000..488aa4853091 --- /dev/null +++ b/redland/raptor/raptor-1.4.18.libxslt.patch @@ -0,0 +1,13 @@ +--- misc/raptor-1.4.18/configure 2011-06-04 01:34:34.000000000 +0200 ++++ misc/build/raptor-1.4.18/configure 2011-06-04 01:34:08.000000000 +0200 +@@ -26474,8 +26474,8 @@ + fi + + if test $need_libxslt = 1; then +- LIBS="$LIBS `$XSLT_CONFIG --libs`" +- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" ++ LIBS="$LIBS $LIBXSLT_LIBS" ++ CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS" + fi + + RAPTOR_LIBTOOLLIBS=libraptor.la |