diff options
author | Greg Larkin <glarkin@FreeBSD.org> | 2012-01-14 05:59:09 +0800 |
---|---|---|
committer | Greg Larkin <glarkin@FreeBSD.org> | 2012-01-14 05:59:09 +0800 |
commit | 92f4bc11bd934a946c515cc9ac85d49af69d9f18 (patch) | |
tree | 86e13da2d929c1cc4c74f3e8114f64f53dab48ee /devel/gearmand/files | |
parent | 073c1ba410c96714ff516cef956f6541346eb418 (diff) | |
download | freebsd-ports-gnome-92f4bc11bd934a946c515cc9ac85d49af69d9f18.tar.gz freebsd-ports-gnome-92f4bc11bd934a946c515cc9ac85d49af69d9f18.tar.zst freebsd-ports-gnome-92f4bc11bd934a946c515cc9ac85d49af69d9f18.zip |
- Unbreak
- Upgrade to 0.26
- Add new build dependencies
- Add new build option for Redis persistent queue
- Move SQLite library version checking to BUILD_DEPENDS from the upstream
configure script. It always failed due to incorrect comparison of a version
string with a version number.
- Update a bunch of depends and CONFIGURE_ARGS due to changes in the upstream
configure script.
PR: ports/164026 (based on)
Submitted by: Marc Peters <marc.peters@trivago.com>
Diffstat (limited to 'devel/gearmand/files')
-rw-r--r-- | devel/gearmand/files/extra-patch-configure | 154 |
1 files changed, 154 insertions, 0 deletions
diff --git a/devel/gearmand/files/extra-patch-configure b/devel/gearmand/files/extra-patch-configure new file mode 100644 index 000000000000..538cdefbdf21 --- /dev/null +++ b/devel/gearmand/files/extra-patch-configure @@ -0,0 +1,154 @@ +--- ./configure.orig 2012-01-13 16:41:29.000000000 -0500 ++++ ./configure 2012-01-13 16:43:45.000000000 -0500 +@@ -23333,150 +23333,12 @@ + + fi + +- +- SQLITE3_CFLAGS="" +- SQLITE3_LDFLAGS="" +- SQLITE3_VERSION="" +- +- if test "x$WANT_SQLITE3" = "xyes"; then +- +- ac_sqlite3_header="sqlite3.h" +- +- sqlite3_version_req=3.0.0 +- sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([0-9]*\.[0-9]*\)'` +- sqlite3_version_req_major=`expr $sqlite3_version_req : '\([0-9]*\)'` +- sqlite3_version_req_minor=`expr $sqlite3_version_req : '[0-9]*\.\([0-9]*\)'` +- sqlite3_version_req_micro=`expr $sqlite3_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` +- if test "x$sqlite3_version_req_micro" = "x" ; then +- sqlite3_version_req_micro="0" +- fi +- +- sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \ +- \+ $sqlite3_version_req_minor \* 1000 \ +- \+ $sqlite3_version_req_micro` +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite3 library >= $sqlite3_version_req" >&5 +-$as_echo_n "checking for SQLite3 library >= $sqlite3_version_req... " >&6; } +- +- if test "$ac_sqlite3_path" != ""; then +- ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib" +- ac_sqlite3_cppflags="-I$ac_sqlite3_path/include" +- else +- for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do +- if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \ +- && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then +- ac_sqlite3_path=$ac_sqlite3_path_tmp +- ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include" +- ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib" +- break; +- fi +- done +- fi +- +- ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3" +- +- saved_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags" +- +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include <sqlite3.h> +-int +-main () +-{ +- +-#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number) +-// Everything is okay +-#else +-# error SQLite version is too old +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- success="yes" +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +-$as_echo "not found" >&6; } +- success="no" +- +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- CPPFLAGS="$saved_CPPFLAGS" +- +- if test "$success" = "yes"; then +- +- SQLITE3_CFLAGS="$ac_sqlite3_cppflags" +- SQLITE3_LDFLAGS="$ac_sqlite3_ldflags" +- +- ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header" +- +- if test "x$ac_sqlite3_header_path" != "x"; then +- ac_sqlite3_version=`cat $ac_sqlite3_header_path \ +- | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \ +- | sed -e 's/"//'` +- if test $ac_sqlite3_version != ""; then +- SQLITE3_VERSION=$ac_sqlite3_version +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&5 +-$as_echo "$as_me: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&2;} +- fi +- fi +- +- +- +- +- +-$as_echo "#define HAVE_SQLITE3 /**/" >>confdefs.h +- +- fi +- fi +- +-if test "x${ac_cv_libsqlite3}" = "xyes"; then : +- +- + $as_echo "#define HAVE_LIBSQLITE3 1 " >>confdefs.h + + +-else +- +- ac_cv_libsqlite3=no +- +-$as_echo "#define HAVE_LIBSQLITE3 0 " >>confdefs.h +- +- +-fi +- if test "x${ac_cv_libsqlite3}" = "xyes"; then + HAVE_LIBSQLITE3_TRUE= + HAVE_LIBSQLITE3_FALSE='#' +-else +- HAVE_LIBSQLITE3_TRUE='#' +- HAVE_LIBSQLITE3_FALSE= +-fi ++ ac_cv_libsqlite3=yes + + + |