mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
- Fix build with FTS2
PR: 115271 Pointy hat to: mnag Reported by: many
This commit is contained in:
Marcus Alves Grando
parent
b23eeb5852
commit
a6a4cb82a2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=197417
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig 2007-06-14 17:54:38.000000000 -0300
|
||||
+++ Makefile.in 2007-07-04 19:23:03.000000000 -0300
|
||||
--- Makefile.in.orig 2007-06-28 09:46:18.000000000 -0300
|
||||
+++ Makefile.in 2007-08-10 08:52:27.000000000 -0300
|
||||
@@ -128,7 +128,9 @@
|
||||
select.lo table.lo tokenize.lo trigger.lo update.lo \
|
||||
util.lo vacuum.lo \
|
||||
@ -7,11 +7,11 @@
|
||||
- where.lo utf.lo legacy.lo vtab.lo
|
||||
+ where.lo utf.lo legacy.lo vtab.lo \
|
||||
+ fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo \
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
|
||||
|
||||
# All of the source code files.
|
||||
#
|
||||
@@ -198,6 +200,14 @@
|
||||
@@ -198,6 +200,15 @@
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
|
||||
@ -21,12 +21,13 @@
|
||||
+ $(TOP)/ext/fts2/fts2_hash.c \
|
||||
+ $(TOP)/ext/fts2/fts2_hash.h \
|
||||
+ $(TOP)/ext/fts2/fts2_porter.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.h \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
|
||||
# Source code to the test files.
|
||||
#
|
||||
@@ -261,6 +271,11 @@
|
||||
@@ -261,6 +272,11 @@
|
||||
$(TOP)/ext/fts1/fts1_hash.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h
|
||||
|
||||
@ -38,31 +39,34 @@
|
||||
# Header files used by the VDBE submodule
|
||||
#
|
||||
VDBEHDR = \
|
||||
@@ -482,6 +497,30 @@
|
||||
@@ -482,6 +498,33 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
|
||||
+
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
|
||||
+
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
|
||||
+
|
||||
+fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
+
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
|
||||
+
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
|
||||
+
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
|
||||
+
|
||||
+fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
|
||||
+
|
||||
+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
+
|
||||
|
||||
@ -14,10 +14,10 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
|
||||
+
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
|
||||
+
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- Makefile.in.orig 2007-06-14 17:54:38.000000000 -0300
|
||||
+++ Makefile.in 2007-07-04 19:24:04.000000000 -0300
|
||||
--- Makefile.in.orig 2007-06-28 09:46:18.000000000 -0300
|
||||
+++ Makefile.in 2007-08-10 08:47:35.000000000 -0300
|
||||
@@ -128,7 +128,8 @@
|
||||
select.lo table.lo tokenize.lo trigger.lo update.lo \
|
||||
util.lo vacuum.lo \
|
||||
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
|
||||
- where.lo utf.lo legacy.lo vtab.lo
|
||||
+ where.lo utf.lo legacy.lo vtab.lo \
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
|
||||
|
||||
# All of the source code files.
|
||||
#
|
||||
@@ -198,6 +199,14 @@
|
||||
@@ -198,6 +199,15 @@
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
|
||||
@ -20,12 +20,13 @@
|
||||
+ $(TOP)/ext/fts2/fts2_hash.c \
|
||||
+ $(TOP)/ext/fts2/fts2_hash.h \
|
||||
+ $(TOP)/ext/fts2/fts2_porter.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.h \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
|
||||
# Source code to the test files.
|
||||
#
|
||||
@@ -261,6 +270,11 @@
|
||||
@@ -261,6 +271,11 @@
|
||||
$(TOP)/ext/fts1/fts1_hash.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h
|
||||
|
||||
@ -37,19 +38,22 @@
|
||||
# Header files used by the VDBE submodule
|
||||
#
|
||||
VDBEHDR = \
|
||||
@@ -482,6 +496,18 @@
|
||||
@@ -482,6 +497,21 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
|
||||
+
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
|
||||
+
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
|
||||
+
|
||||
+fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
|
||||
+
|
||||
+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
+
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig 2007-06-14 17:54:38.000000000 -0300
|
||||
+++ Makefile.in 2007-07-04 19:23:03.000000000 -0300
|
||||
--- Makefile.in.orig 2007-06-28 09:46:18.000000000 -0300
|
||||
+++ Makefile.in 2007-08-10 08:52:27.000000000 -0300
|
||||
@@ -128,7 +128,9 @@
|
||||
select.lo table.lo tokenize.lo trigger.lo update.lo \
|
||||
util.lo vacuum.lo \
|
||||
@ -7,11 +7,11 @@
|
||||
- where.lo utf.lo legacy.lo vtab.lo
|
||||
+ where.lo utf.lo legacy.lo vtab.lo \
|
||||
+ fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo \
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
|
||||
|
||||
# All of the source code files.
|
||||
#
|
||||
@@ -198,6 +200,14 @@
|
||||
@@ -198,6 +200,15 @@
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
|
||||
@ -21,12 +21,13 @@
|
||||
+ $(TOP)/ext/fts2/fts2_hash.c \
|
||||
+ $(TOP)/ext/fts2/fts2_hash.h \
|
||||
+ $(TOP)/ext/fts2/fts2_porter.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.h \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
|
||||
# Source code to the test files.
|
||||
#
|
||||
@@ -261,6 +271,11 @@
|
||||
@@ -261,6 +272,11 @@
|
||||
$(TOP)/ext/fts1/fts1_hash.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h
|
||||
|
||||
@ -38,31 +39,34 @@
|
||||
# Header files used by the VDBE submodule
|
||||
#
|
||||
VDBEHDR = \
|
||||
@@ -482,6 +497,30 @@
|
||||
@@ -482,6 +498,33 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
|
||||
+
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
|
||||
+
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
|
||||
+
|
||||
+fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
+
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
|
||||
+
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
|
||||
+
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
|
||||
+
|
||||
+fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
|
||||
+
|
||||
+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
+
|
||||
|
||||
@ -14,10 +14,10 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
|
||||
+
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
|
||||
+
|
||||
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- Makefile.in.orig 2007-06-14 17:54:38.000000000 -0300
|
||||
+++ Makefile.in 2007-07-04 19:24:04.000000000 -0300
|
||||
--- Makefile.in.orig 2007-06-28 09:46:18.000000000 -0300
|
||||
+++ Makefile.in 2007-08-10 08:47:35.000000000 -0300
|
||||
@@ -128,7 +128,8 @@
|
||||
select.lo table.lo tokenize.lo trigger.lo update.lo \
|
||||
util.lo vacuum.lo \
|
||||
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
|
||||
- where.lo utf.lo legacy.lo vtab.lo
|
||||
+ where.lo utf.lo legacy.lo vtab.lo \
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
|
||||
+ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
|
||||
|
||||
# All of the source code files.
|
||||
#
|
||||
@@ -198,6 +199,14 @@
|
||||
@@ -198,6 +199,15 @@
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer1.c
|
||||
|
||||
@ -20,12 +20,13 @@
|
||||
+ $(TOP)/ext/fts2/fts2_hash.c \
|
||||
+ $(TOP)/ext/fts2/fts2_hash.h \
|
||||
+ $(TOP)/ext/fts2/fts2_porter.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.c \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer.h \
|
||||
+ $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
|
||||
# Source code to the test files.
|
||||
#
|
||||
@@ -261,6 +270,11 @@
|
||||
@@ -261,6 +271,11 @@
|
||||
$(TOP)/ext/fts1/fts1_hash.h \
|
||||
$(TOP)/ext/fts1/fts1_tokenizer.h
|
||||
|
||||
@ -37,19 +38,22 @@
|
||||
# Header files used by the VDBE submodule
|
||||
#
|
||||
VDBEHDR = \
|
||||
@@ -482,6 +496,18 @@
|
||||
@@ -482,6 +497,21 @@
|
||||
where.lo: $(TOP)/src/where.c $(HDR)
|
||||
$(LTCOMPILE) -c $(TOP)/src/where.c
|
||||
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
|
||||
+
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
|
||||
+
|
||||
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
|
||||
+
|
||||
+fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
|
||||
+
|
||||
+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
|
||||
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
|
||||
+
|
||||
|
||||
Loading…
Reference in New Issue
Block a user