diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-06 00:44:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-06 00:44:54 +0300 |
| commit | fe7b7a1d4d2fb5151e2ca17130ca1020ece69f26 (patch) | |
| tree | 1faa01bbf81b790c1361ca4bd9d7b59437c14d6e /redland | |
| parent | ca1ee8a68498087cf592d72c6e4806069a54d8a3 (diff) | |
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.
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 3 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.cross | 58 |
2 files changed, 36 insertions, 25 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index e0e4968be778..f8371054ee84 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 5262dc1b8bed..bf4c43240492 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. */ |