[Libreoffice-commits] .: 2 commits - redland/raptor redland/rasqal redland/redland

Tor Lillqvist tml at kemper.freedesktop.org
Sun Jun 5 14:47:38 PDT 2011 

 redland/raptor/makefile.mk               |    5 +-
 redland/raptor/raptor-1.4.18.patch.cross |   58 ++++++++++++++++++-------------
 redland/rasqal/makefile.mk               |    2 -
 redland/redland/makefile.mk              |    2 -
 4 files changed, 39 insertions(+), 28 deletions(-)

New commits:
commit dcfd860f5bb25ff6b2d80c1cfb209f70222c5cd0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 6 00:47:28 2011 +0300

    Bin unnecessary quoting

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index f837105..248a721 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -146,7 +146,7 @@ CONFIGURE_FLAGS=--disable-static
 # do not enable grddl parser (#i93768#)
 CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 2b09a4d..417df11 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -131,7 +131,7 @@ CONFIGURE_FLAGS=--disable-static
 .ENDIF
 CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index bbfe814..ec4941c 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -135,7 +135,7 @@ CONFIGURE_FLAGS=--disable-static
 .ENDIF
 CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
commit 1b91d8287201609fd76178568453ea82f980c972
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 6 00:44:45 2011 +0300

    Patch raptor configure, not configure.ac for cross-compilation
    
    It looks sillier, yes, but it is good to not have to run
    autoconf. Fixes cross-compilation for ppc MacOSX.

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index e0e4968..f837105 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -137,11 +137,10 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 .EXPORT: XSLTLIB
 
 CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
 .IF "$(OS)"=="IOS"
-CONFIGURE_ACTION=autoconf; .$/configure
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
-CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
 # do not enable grddl parser (#i93768#)
diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross
index 5262dc1..bf4c432 100644
--- a/redland/raptor/raptor-1.4.18.patch.cross
+++ b/redland/raptor/raptor-1.4.18.patch.cross
@@ -1,23 +1,35 @@
---- misc/raptor-1.4.18/configure.ac
-+++ misc/build/raptor-1.4.18/configure.ac
-@@ -295,7 +295,9 @@
-   return is_c99("1234567");
- }], AC_MSG_RESULT(no),
-     AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
--    AC_MSG_RESULT(yes))
-+    AC_MSG_RESULT(yes),
-+    AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
-+    AC_MSG_RESULT([guessing yes]))
- fi
-
- need_libm=no
-@@ -456,7 +458,8 @@
-             AC_DEFINE(EXPAT_UTF8_BOM_CRASH, 1, [does expat crash when it sees an initial UTF8 BOM?])
-             AC_MSG_RESULT(no)
-             AC_MSG_WARN(The available expat crashes on XML UTF-8 BOM in documents)
--            AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+))
-+            AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+),
-+	    AC_MSG_RESULT(guessing yes))
-
-   else
-     AC_MSG_RESULT(no)
+--- misc/raptor-1.4.18/configure
++++ misc/build/raptor-1.4.18/configure
+@@ -22643,11 +22643,13 @@
+   { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
+ echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_C99_VSNPRINTF 1
++_ACEOF
++
++    { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23367,11 +23369,8 @@
+     { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
+ echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
+     if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */

More information about the Libreoffice-commits mailing list