[arch-commits] Commit in sqlite/repos (10 files)
Andreas Radke
andyrtr at archlinux.org
Tue May 30 15:03:08 UTC 2017
Date: Tuesday, May 30, 2017 @ 15:03:08
Author: andyrtr
Revision: 296747
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
sqlite/repos/testing-i686/PKGBUILD
(from rev 296746, sqlite/trunk/PKGBUILD)
sqlite/repos/testing-i686/configure.patch
(from rev 296746, sqlite/trunk/configure.patch)
sqlite/repos/testing-i686/license.txt
(from rev 296746, sqlite/trunk/license.txt)
sqlite/repos/testing-x86_64/PKGBUILD
(from rev 296746, sqlite/trunk/PKGBUILD)
sqlite/repos/testing-x86_64/configure.patch
(from rev 296746, sqlite/trunk/configure.patch)
sqlite/repos/testing-x86_64/license.txt
(from rev 296746, sqlite/trunk/license.txt)
Deleted:
sqlite/repos/testing-i686/PKGBUILD
sqlite/repos/testing-i686/license.txt
sqlite/repos/testing-x86_64/PKGBUILD
sqlite/repos/testing-x86_64/license.txt
--------------------------------+
/PKGBUILD | 246 +++++++++++++++++++++++++++++++++++++++
/license.txt | 66 ++++++++++
testing-i686/PKGBUILD | 118 ------------------
testing-i686/configure.patch | 210 +++++++++++++++++++++++++++++++++
testing-i686/license.txt | 33 -----
testing-x86_64/PKGBUILD | 118 ------------------
testing-x86_64/configure.patch | 210 +++++++++++++++++++++++++++++++++
testing-x86_64/license.txt | 33 -----
8 files changed, 732 insertions(+), 302 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-05-30 15:02:46 UTC (rev 296746)
+++ testing-i686/PKGBUILD 2017-05-30 15:03:08 UTC (rev 296747)
@@ -1,118 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgbase="sqlite"
-pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer')
-_srcver=3190200
-_docver=${_srcver}
-#_docver=3080001
-pkgver=3.19.2
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom:Public Domain')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline')
-source=(https://www.sqlite.org/2017/sqlite-src-${_srcver}.zip
- https://www.sqlite.org/2017/sqlite-doc-${_docver}.zip
- license.txt)
-options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
-sha1sums=('c20cca8042b87cf68c4c3bc81297857e13bd1ca8'
- '81f1ff9c8025f37b7ae60237aa2626d4563c8bb5'
- 'f34f6daa4ab3073d74e774aad21d66878cf26853')
-
-prepare() {
- cd sqlite-src-$_srcver
-# autoreconf -vfi
-}
-
-build() {
- export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY \
- -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
- -DSQLITE_SECURE_DELETE \
- -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
- -DSQLITE_MAX_EXPR_DEPTH=10000"
-
- # build sqlite
- cd sqlite-src-$_srcver
- ./configure --prefix=/usr \
- --disable-static \
- --disable-amalgamation \
- --enable-fts3 \
- --enable-fts4 \
- --enable-fts5 \
- --enable-rtree \
- --enable-json1 \
- TCLLIBDIR=/usr/lib/sqlite$pkgver
- make
- # build additional tools
- make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
-}
-
-package_sqlite() {
-
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline')
- provides=("sqlite3=$pkgver")
- replaces=("sqlite3")
-
- cd sqlite-src-$_srcver
- make DESTDIR=${pkgdir} install
-
- install -m755 showdb showjournal showstat4 showwal sqldiff ${pkgdir}/usr/bin/
-
- # install manpage
- install -m755 -d ${pkgdir}/usr/share/man/man1
- install -m644 sqlite3.1 ${pkgdir}/usr/share/man/man1/
-
- # license - no linking required because pkgbase=pkgname
- install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt
-
- # split out tcl extension
- mkdir $srcdir/tcl
- mv $pkgdir/usr/lib/sqlite* $srcdir/tcl
-}
-
-package_sqlite-tcl() {
-
- pkgdesc="sqlite Tcl Extension Architecture (TEA)"
- depends=('sqlite')
- provides=("sqlite3-tcl=$pkgver")
- replaces=("sqlite3-tcl")
-
- install -m755 -d ${pkgdir}/usr/lib
- mv $srcdir/tcl/* ${pkgdir}/usr/lib
-
- # install manpage
- install -m755 -d ${pkgdir}/usr/share/man/mann
- install -m644 ${srcdir}/sqlite-src-$_srcver/autoconf/tea/doc/sqlite3.n ${pkgdir}/usr/share/man/mann/
-
- # link license
- install -m755 -d ${pkgdir}/usr/share/licenses
- ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_sqlite-analyzer() {
-
- pkgdesc="An analysis program for sqlite3 database files"
- depends=('sqlite' 'tcl')
-
- cd sqlite-src-$_srcver
- install -m755 -d ${pkgdir}/usr/bin
- install -m755 sqlite3_analyzer ${pkgdir}/usr/bin/
-}
-
-package_sqlite-doc() {
-
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
- provides=("sqlite3-doc=$pkgver")
- replaces=("sqlite3-doc")
-
- cd sqlite-doc-${_docver}
- mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
- cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
-}
Copied: sqlite/repos/testing-i686/PKGBUILD (from rev 296746, sqlite/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-05-30 15:03:08 UTC (rev 296747)
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase="sqlite"
+pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer')
+_srcver=3190200
+_docver=${_srcver}
+#_docver=3080001
+pkgver=3.19.2
+pkgrel=2
+pkgdesc="A C library that implements an SQL database engine"
+arch=('i686' 'x86_64')
+license=('custom:Public Domain')
+url="http://www.sqlite.org/"
+makedepends=('tcl' 'readline')
+source=(https://www.sqlite.org/2017/sqlite-src-${_srcver}.zip
+ https://www.sqlite.org/2017/sqlite-doc-${_docver}.zip
+ license.txt
+ configure.patch)
+options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
+sha1sums=('c20cca8042b87cf68c4c3bc81297857e13bd1ca8'
+ '81f1ff9c8025f37b7ae60237aa2626d4563c8bb5'
+ '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() {
+ export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+ -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
+ -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+ -DSQLITE_SECURE_DELETE \
+ -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+ -DSQLITE_MAX_EXPR_DEPTH=10000"
+
+ # build sqlite
+ cd sqlite-src-$_srcver
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-amalgamation \
+ --enable-fts3 \
+ --enable-fts4 \
+ --enable-fts5 \
+ --enable-rtree \
+ --enable-json1 \
+ TCLLIBDIR=/usr/lib/sqlite$pkgver
+ make
+ # build additional tools
+ make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+}
+
+package_sqlite() {
+
+ pkgdesc="A C library that implements an SQL database engine"
+ depends=('readline')
+ provides=("sqlite3=$pkgver")
+ replaces=("sqlite3")
+
+ cd sqlite-src-$_srcver
+ make DESTDIR=${pkgdir} install
+
+ install -m755 showdb showjournal showstat4 showwal sqldiff ${pkgdir}/usr/bin/
+
+ # install manpage
+ install -m755 -d ${pkgdir}/usr/share/man/man1
+ install -m644 sqlite3.1 ${pkgdir}/usr/share/man/man1/
+
+ # license - no linking required because pkgbase=pkgname
+ install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt
+
+ # split out tcl extension
+ mkdir $srcdir/tcl
+ mv $pkgdir/usr/lib/sqlite* $srcdir/tcl
+}
+
+package_sqlite-tcl() {
+
+ pkgdesc="sqlite Tcl Extension Architecture (TEA)"
+ depends=('sqlite')
+ provides=("sqlite3-tcl=$pkgver")
+ replaces=("sqlite3-tcl")
+
+ install -m755 -d ${pkgdir}/usr/lib
+ mv $srcdir/tcl/* ${pkgdir}/usr/lib
+
+ # install manpage
+ install -m755 -d ${pkgdir}/usr/share/man/mann
+ install -m644 ${srcdir}/sqlite-src-$_srcver/autoconf/tea/doc/sqlite3.n ${pkgdir}/usr/share/man/mann/
+
+ # link license
+ install -m755 -d ${pkgdir}/usr/share/licenses
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_sqlite-analyzer() {
+
+ pkgdesc="An analysis program for sqlite3 database files"
+ depends=('sqlite' 'tcl')
+
+ cd sqlite-src-$_srcver
+ install -m755 -d ${pkgdir}/usr/bin
+ install -m755 sqlite3_analyzer ${pkgdir}/usr/bin/
+}
+
+package_sqlite-doc() {
+
+ pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
+ #arch=('any') - not yet supported
+ provides=("sqlite3-doc=$pkgver")
+ replaces=("sqlite3-doc")
+
+ cd sqlite-doc-${_docver}
+ mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
+ cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
+}
Copied: sqlite/repos/testing-i686/configure.patch (from rev 296746, sqlite/trunk/configure.patch)
===================================================================
--- testing-i686/configure.patch (rev 0)
+++ testing-i686/configure.patch 2017-05-30 15:03:08 UTC (rev 296747)
@@ -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";;
+
+
Deleted: testing-i686/license.txt
===================================================================
--- testing-i686/license.txt 2017-05-30 15:02:46 UTC (rev 296746)
+++ testing-i686/license.txt 2017-05-30 15:03:08 UTC (rev 296747)
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
-You are using SQLite in a jurisdiction that does not recognize the public domain.
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
-Your legal department tells you that you have to purchase a license.
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
\ No newline at end of file
Copied: sqlite/repos/testing-i686/license.txt (from rev 296746, sqlite/trunk/license.txt)
===================================================================
--- testing-i686/license.txt (rev 0)
+++ testing-i686/license.txt 2017-05-30 15:03:08 UTC (rev 296747)
@@ -0,0 +1,33 @@
+SQLite Copyright
+SQLite is in the
+Public Domain
+
+
+All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+
+The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
+
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+Obtaining An Explicit License To Use SQLite
+
+Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
+You are using SQLite in a jurisdiction that does not recognize the public domain.
+You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
+You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+Your legal department tells you that you have to purchase a license.
+
+If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
+Contributed Code
+
+In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
+The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
+
+We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA
+
+A template copyright release is available in PDF or HTML. You can use this release to make future changes.
+
+see http://www.sqlite.org/copyright.html
\ No newline at end of file
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-05-30 15:02:46 UTC (rev 296746)
+++ testing-x86_64/PKGBUILD 2017-05-30 15:03:08 UTC (rev 296747)
@@ -1,118 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgbase="sqlite"
-pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer')
-_srcver=3190200
-_docver=${_srcver}
-#_docver=3080001
-pkgver=3.19.2
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom:Public Domain')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline')
-source=(https://www.sqlite.org/2017/sqlite-src-${_srcver}.zip
- https://www.sqlite.org/2017/sqlite-doc-${_docver}.zip
- license.txt)
-options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
-sha1sums=('c20cca8042b87cf68c4c3bc81297857e13bd1ca8'
- '81f1ff9c8025f37b7ae60237aa2626d4563c8bb5'
- 'f34f6daa4ab3073d74e774aad21d66878cf26853')
-
-prepare() {
- cd sqlite-src-$_srcver
-# autoreconf -vfi
-}
-
-build() {
- export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY \
- -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
- -DSQLITE_SECURE_DELETE \
- -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
- -DSQLITE_MAX_EXPR_DEPTH=10000"
-
- # build sqlite
- cd sqlite-src-$_srcver
- ./configure --prefix=/usr \
- --disable-static \
- --disable-amalgamation \
- --enable-fts3 \
- --enable-fts4 \
- --enable-fts5 \
- --enable-rtree \
- --enable-json1 \
- TCLLIBDIR=/usr/lib/sqlite$pkgver
- make
- # build additional tools
- make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
-}
-
-package_sqlite() {
-
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline')
- provides=("sqlite3=$pkgver")
- replaces=("sqlite3")
-
- cd sqlite-src-$_srcver
- make DESTDIR=${pkgdir} install
-
- install -m755 showdb showjournal showstat4 showwal sqldiff ${pkgdir}/usr/bin/
-
- # install manpage
- install -m755 -d ${pkgdir}/usr/share/man/man1
- install -m644 sqlite3.1 ${pkgdir}/usr/share/man/man1/
-
- # license - no linking required because pkgbase=pkgname
- install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt
-
- # split out tcl extension
- mkdir $srcdir/tcl
- mv $pkgdir/usr/lib/sqlite* $srcdir/tcl
-}
-
-package_sqlite-tcl() {
-
- pkgdesc="sqlite Tcl Extension Architecture (TEA)"
- depends=('sqlite')
- provides=("sqlite3-tcl=$pkgver")
- replaces=("sqlite3-tcl")
-
- install -m755 -d ${pkgdir}/usr/lib
- mv $srcdir/tcl/* ${pkgdir}/usr/lib
-
- # install manpage
- install -m755 -d ${pkgdir}/usr/share/man/mann
- install -m644 ${srcdir}/sqlite-src-$_srcver/autoconf/tea/doc/sqlite3.n ${pkgdir}/usr/share/man/mann/
-
- # link license
- install -m755 -d ${pkgdir}/usr/share/licenses
- ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_sqlite-analyzer() {
-
- pkgdesc="An analysis program for sqlite3 database files"
- depends=('sqlite' 'tcl')
-
- cd sqlite-src-$_srcver
- install -m755 -d ${pkgdir}/usr/bin
- install -m755 sqlite3_analyzer ${pkgdir}/usr/bin/
-}
-
-package_sqlite-doc() {
-
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
- provides=("sqlite3-doc=$pkgver")
- replaces=("sqlite3-doc")
-
- cd sqlite-doc-${_docver}
- mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
- cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
-}
Copied: sqlite/repos/testing-x86_64/PKGBUILD (from rev 296746, sqlite/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-05-30 15:03:08 UTC (rev 296747)
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase="sqlite"
+pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer')
+_srcver=3190200
+_docver=${_srcver}
+#_docver=3080001
+pkgver=3.19.2
+pkgrel=2
+pkgdesc="A C library that implements an SQL database engine"
+arch=('i686' 'x86_64')
+license=('custom:Public Domain')
+url="http://www.sqlite.org/"
+makedepends=('tcl' 'readline')
+source=(https://www.sqlite.org/2017/sqlite-src-${_srcver}.zip
+ https://www.sqlite.org/2017/sqlite-doc-${_docver}.zip
+ license.txt
+ configure.patch)
+options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
+sha1sums=('c20cca8042b87cf68c4c3bc81297857e13bd1ca8'
+ '81f1ff9c8025f37b7ae60237aa2626d4563c8bb5'
+ '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() {
+ export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+ -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
+ -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+ -DSQLITE_SECURE_DELETE \
+ -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+ -DSQLITE_MAX_EXPR_DEPTH=10000"
+
+ # build sqlite
+ cd sqlite-src-$_srcver
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-amalgamation \
+ --enable-fts3 \
+ --enable-fts4 \
+ --enable-fts5 \
+ --enable-rtree \
+ --enable-json1 \
+ TCLLIBDIR=/usr/lib/sqlite$pkgver
+ make
+ # build additional tools
+ make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+}
+
+package_sqlite() {
+
+ pkgdesc="A C library that implements an SQL database engine"
+ depends=('readline')
+ provides=("sqlite3=$pkgver")
+ replaces=("sqlite3")
+
+ cd sqlite-src-$_srcver
+ make DESTDIR=${pkgdir} install
+
+ install -m755 showdb showjournal showstat4 showwal sqldiff ${pkgdir}/usr/bin/
+
+ # install manpage
+ install -m755 -d ${pkgdir}/usr/share/man/man1
+ install -m644 sqlite3.1 ${pkgdir}/usr/share/man/man1/
+
+ # license - no linking required because pkgbase=pkgname
+ install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt
+
+ # split out tcl extension
+ mkdir $srcdir/tcl
+ mv $pkgdir/usr/lib/sqlite* $srcdir/tcl
+}
+
+package_sqlite-tcl() {
+
+ pkgdesc="sqlite Tcl Extension Architecture (TEA)"
+ depends=('sqlite')
+ provides=("sqlite3-tcl=$pkgver")
+ replaces=("sqlite3-tcl")
+
+ install -m755 -d ${pkgdir}/usr/lib
+ mv $srcdir/tcl/* ${pkgdir}/usr/lib
+
+ # install manpage
+ install -m755 -d ${pkgdir}/usr/share/man/mann
+ install -m644 ${srcdir}/sqlite-src-$_srcver/autoconf/tea/doc/sqlite3.n ${pkgdir}/usr/share/man/mann/
+
+ # link license
+ install -m755 -d ${pkgdir}/usr/share/licenses
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_sqlite-analyzer() {
+
+ pkgdesc="An analysis program for sqlite3 database files"
+ depends=('sqlite' 'tcl')
+
+ cd sqlite-src-$_srcver
+ install -m755 -d ${pkgdir}/usr/bin
+ install -m755 sqlite3_analyzer ${pkgdir}/usr/bin/
+}
+
+package_sqlite-doc() {
+
+ pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
+ #arch=('any') - not yet supported
+ provides=("sqlite3-doc=$pkgver")
+ replaces=("sqlite3-doc")
+
+ cd sqlite-doc-${_docver}
+ mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
+ cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
+}
Copied: sqlite/repos/testing-x86_64/configure.patch (from rev 296746, sqlite/trunk/configure.patch)
===================================================================
--- testing-x86_64/configure.patch (rev 0)
+++ testing-x86_64/configure.patch 2017-05-30 15:03:08 UTC (rev 296747)
@@ -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";;
+
+
Deleted: testing-x86_64/license.txt
===================================================================
--- testing-x86_64/license.txt 2017-05-30 15:02:46 UTC (rev 296746)
+++ testing-x86_64/license.txt 2017-05-30 15:03:08 UTC (rev 296747)
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
-You are using SQLite in a jurisdiction that does not recognize the public domain.
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
-Your legal department tells you that you have to purchase a license.
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
\ No newline at end of file
Copied: sqlite/repos/testing-x86_64/license.txt (from rev 296746, sqlite/trunk/license.txt)
===================================================================
--- testing-x86_64/license.txt (rev 0)
+++ testing-x86_64/license.txt 2017-05-30 15:03:08 UTC (rev 296747)
@@ -0,0 +1,33 @@
+SQLite Copyright
+SQLite is in the
+Public Domain
+
+
+All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+
+The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
+
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+Obtaining An Explicit License To Use SQLite
+
+Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
+You are using SQLite in a jurisdiction that does not recognize the public domain.
+You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
+You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+Your legal department tells you that you have to purchase a license.
+
+If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
+Contributed Code
+
+In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
+The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
+
+We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA
+
+A template copyright release is available in PDF or HTML. You can use this release to make future changes.
+
+see http://www.sqlite.org/copyright.html
\ No newline at end of file
More information about the arch-commits
mailing list