2c9ebc2459
Tested by phessler@ on loongson/sparc, jasper@ on arm, myself on amd64/sparc64/macppc, and went through a pair of amd64 bulk builds without issues. ok sthen@ dcoppa@
63 lines
2.0 KiB
Plaintext
63 lines
2.0 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.17 2011/03/14 14:39:51 landry Exp $
|
|
--- Makefile.in.orig Thu Mar 10 17:55:45 2011
|
|
+++ Makefile.in Thu Mar 10 18:01:04 2011
|
|
@@ -186,7 +186,7 @@ LIBOBJS1 = sqlite3.lo
|
|
|
|
# Determine the real value of LIBOBJ based on the 'configure' script
|
|
#
|
|
-LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
|
|
+LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION)) pthread_stub.lo
|
|
|
|
|
|
# All of the source code files.
|
|
@@ -282,6 +282,8 @@ SRC = \
|
|
$(TOP)/src/walker.c \
|
|
$(TOP)/src/where.c
|
|
|
|
+SRC += $(TOP)/src/pthread_stub.c
|
|
+
|
|
# Source code for extensions
|
|
#
|
|
SRC += \
|
|
@@ -757,6 +759,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
|
|
$(LTLINK) -o $@ tclsqlite-shell.lo \
|
|
libsqlite3.la $(LIBTCL)
|
|
|
|
+pthread_stub.lo: $(TOP)/src/pthread_stub.c
|
|
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pthread_stub.c
|
|
+
|
|
# Rules to build opcodes.c and opcodes.h
|
|
#
|
|
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
|
@@ -777,7 +782,11 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
|
|
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
|
|
|
|
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
|
|
- tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
|
|
+ sed -e '/^#include <sqlite3\.h>$$/d' \
|
|
+ -e 's/--VERS--/$(RELEASE)/' \
|
|
+ -e 's/--VERSION-NUMBER--/$(VERSION_NUMBER)/' \
|
|
+ $(TOP)/src/sqlite.h.in $(TOP)/ext/rtree/sqlite3rtree.h \
|
|
+ > sqlite3.h
|
|
|
|
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
|
|
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
|
|
@@ -850,7 +859,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLIT
|
|
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
|
|
|
|
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
|
|
-TESTFIXTURE_SRC1 = sqlite3.c
|
|
+TESTFIXTURE_SRC1 = sqlite3.c $(TOP)/src/pthread_stub.c
|
|
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
|
|
|
|
testfixture$(TEXE): $(TESTFIXTURE_SRC)
|
|
@@ -918,6 +927,8 @@ clean:
|
|
|
|
distclean: clean
|
|
rm -f config.log config.status libtool Makefile sqlite3.pc
|
|
+
|
|
+.PHONY: test
|
|
|
|
#
|
|
# Windows section
|