[Cryptech-Commits] [user/sra/sqlite3] 01/01: Support no-threads build (work around Novena gdb problem). Add copyright.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository user/sra/sqlite3.

commit 48ec7e3996bc61fd2be4dfb04c1f71c4496ebd2f
Author: Rob Austein <sra at hactrn.net>
Date:   Fri Jun 26 14:15:34 2015 -0400

    Support no-threads build (work around Novena gdb problem).  Add copyright.
---
 GNUmakefile | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 447589d..ce718f7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,8 +1,48 @@
-# Download and build SQLite3 from source with the options we want.
+# (GNU) Makefile to download and build SQLite3 from source with the
+# options we want for PKCS #11.
+#
+# Author: Rob Austein
+# Copyright (c) 2015, SUNET
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Whether to enable threading.  Main reason for being able to turn it
+# off is that gdb on the Novena goes bananas when threading is enabled.
+
+ifndef ENABLE_THREADS
+  ENABLE_THREADS := yes
+endif
 
 URL	:= http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz
 OPTIONS	:= --enable-static --disable-shared CFLAGS=-fPIC LDFLAGS=-fPIC
 
+ifneq "${ENABLE_THREADS}" "yes"
+  OPTIONS += --disable-threadsafe
+endif
+
 TOP	:= $(shell pwd)
 TARBALL	:= ${TOP}/$(notdir ${URL})
 BUILD	:= ${TOP}/build