[arch-commits] Commit in sqlite/trunk (PKGBUILD configure.patch)
Andreas Radke
andyrtr at archlinux.org
Tue May 30 15:02:47 UTC 2017
Date: Tuesday, May 30, 2017 @ 15:02:46
Author: andyrtr
Revision: 296746
upgpkg: sqlite 3.19.2-2
fix broken configure flags - FS#54227
Added:
sqlite/trunk/configure.patch
Modified:
sqlite/trunk/PKGBUILD
-----------------+
PKGBUILD | 11 ++
configure.patch | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 218 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-05-30 11:36:32 UTC (rev 296745)
+++ PKGBUILD 2017-05-30 15:02:46 UTC (rev 296746)
@@ -8,7 +8,7 @@
_docver=${_srcver}
#_docver=3080001
pkgver=3.19.2
-pkgrel=1
+pkgrel=2
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64')
license=('custom:Public Domain')
@@ -16,15 +16,20 @@
makedepends=('tcl' 'readline')
source=(https://www.sqlite.org/2017/sqlite-src-${_srcver}.zip
https://www.sqlite.org/2017/sqlite-doc-${_docver}.zip
- license.txt)
+ license.txt
+ configure.patch)
options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
sha1sums=('c20cca8042b87cf68c4c3bc81297857e13bd1ca8'
'81f1ff9c8025f37b7ae60237aa2626d4563c8bb5'
- 'f34f6daa4ab3073d74e774aad21d66878cf26853')
+ 'f34f6daa4ab3073d74e774aad21d66878cf26853'
+ '0cdcdd429d86a745b872eafc347a552e4d1d9ac0')
prepare() {
cd sqlite-src-$_srcver
# autoreconf -vfi
+ # fix broken configure flags
+ # https://www.sqlite.org/src/info/43ce3bd3a4b41ea7
+ patch -Np0 -i ../configure.patch
}
build() {
Added: configure.patch
===================================================================
--- configure.patch (rev 0)
+++ configure.patch 2017-05-30 15:02:46 UTC (rev 296746)
@@ -0,0 +1,210 @@
+Index: configure
+==================================================================
+--- configure
++++ configure
+@@ -11354,11 +11354,11 @@
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
+ $as_echo_n "checking whether to support MEMSYS5... " >&6; }
+ if test "${enable_memsys5}" = "yes"; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -11371,11 +11371,11 @@
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
+ $as_echo_n "checking whether to support MEMSYS3... " >&6; }
+ if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -11389,21 +11389,21 @@
+ else
+ enable_fts3=no
+ fi
+
+ if test "${enable_fts3}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
+ fi
+ # Check whether --enable-fts4 was given.
+ if test "${enable_fts4+set}" = set; then :
+ enableval=$enable_fts4; enable_fts4=yes
+ else
+ enable_fts4=no
+ fi
+
+ if test "${enable_fts4}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
+ $as_echo_n "checking for library containing log... " >&6; }
+ if ${ac_cv_search_log+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -11465,11 +11465,11 @@
+ else
+ enable_fts5=no
+ fi
+
+ if test "${enable_fts5}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
+ $as_echo_n "checking for library containing log... " >&6; }
+ if ${ac_cv_search_log+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -11534,11 +11534,11 @@
+ else
+ enable_json1=no
+ fi
+
+ if test "${enable_json1}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
+ fi
+
+ #########
+ # See whether we should enable RTREE
+ # Check whether --enable-rtree was given.
+@@ -11547,11 +11547,11 @@
+ else
+ enable_rtree=no
+ fi
+
+ if test "${enable_rtree}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
+ fi
+
+ #########
+ # See whether we should enable the SESSION extension
+ # Check whether --enable-session was given.
+@@ -11560,16 +11560,16 @@
+ else
+ enable_session=no
+ fi
+
+ if test "${enable_session}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
+ fi
+
+ #########
+-# attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
++# attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter
+ for option in $CFLAGS $CPPFLAGS
+ do
+ case $option in
+ -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
+ -DSQLITE_ENABLE*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
+
+Index: configure.ac
+==================================================================
+--- configure.ac
++++ configure.ac
+@@ -594,21 +594,21 @@
+ AC_ARG_ENABLE(memsys5,
+ AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
+ [enable_memsys5=yes],[enable_memsys5=no])
+ AC_MSG_CHECKING([whether to support MEMSYS5])
+ if test "${enable_memsys5}" = "yes"; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ AC_ARG_ENABLE(memsys3,
+ AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
+ [enable_memsys3=yes],[enable_memsys3=no])
+ AC_MSG_CHECKING([whether to support MEMSYS3])
+ if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+@@ -616,57 +616,57 @@
+ # See whether we should enable Full Text Search extensions
+ AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3],
+ [Enable the FTS3 extension]),
+ [enable_fts3=yes],[enable_fts3=no])
+ if test "${enable_fts3}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
+ fi
+ AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4],
+ [Enable the FTS4 extension]),
+ [enable_fts4=yes],[enable_fts4=no])
+ if test "${enable_fts4}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
+ AC_SEARCH_LIBS([log],[m])
+ fi
+ AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5],
+ [Enable the FTS5 extension]),
+ [enable_fts5=yes],[enable_fts5=no])
+ if test "${enable_fts5}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
+ AC_SEARCH_LIBS([log],[m])
+ fi
+
+ #########
+ # See whether we should enable JSON1
+ AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],
+ [Enable the JSON1 extension]),
+ [enable_json1=yes],[enable_json1=no])
+ if test "${enable_json1}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
+ fi
+
+ #########
+ # See whether we should enable RTREE
+ AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree],
+ [Enable the RTREE extension]),
+ [enable_rtree=yes],[enable_rtree=no])
+ if test "${enable_rtree}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
+ fi
+
+ #########
+ # See whether we should enable the SESSION extension
+ AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
+ [Enable the SESSION extension]),
+ [enable_session=yes],[enable_session=no])
+ if test "${enable_session}" = "yes" ; then
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
+- OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
++ OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
+ fi
+
+ #########
+-# attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
++# attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter
+ for option in $CFLAGS $CPPFLAGS
+ do
+ case $option in
+ -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
+ -DSQLITE_ENABLE*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
+
+
More information about the arch-commits
mailing list