blob: 71dae4939a7cd74d14e6f2891d3e3c5b77e18773 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
Disable various items that do not cross compile well.
Upstream-Status: Inappropriate [Configuration]
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Index: rpm/rpmdb/Makefile.am
===================================================================
--- rpm.orig/rpmdb/Makefile.am
+++ rpm/rpmdb/Makefile.am
@@ -34,10 +34,10 @@ EXTRA_DIST = \
db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql libsqldb.c \
logio.awk logio.src logio_recover_template logio_template logio.c \
logio_rec.c logio_auto.c logio_autop.c logio_auto.h \
- qf.l qf.y qf.inp tqf.l tqf.y tqf.inp grammar.y scanner.l json1.js
+ tqf.l tqf.y tqf.inp grammar.y scanner.l json1.js
-EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf # tbdb
-noinst_PROGRAMS = json
+EXTRA_PROGRAMS = qfcalc qfgraph logio # tjfn tqf tbdb
+noinst_PROGRAMS = # json
RPMMISC_LDADD_COMMON = \
$(top_builddir)/misc/librpmmisc.la \
@@ -321,54 +321,39 @@ BUILT_SOURCES += .syntastic_c_config
.syntastic_c_config: Makefile
@echo $(COMPILE) | tr ' ' '\n' | sed -e '1d' > $@
-tjfn_SOURCES = tjfn.c
-tjfn_LDADD = $(mylibs)
-
-LEX = flex
-LFLAGS= -d -T -v -8 -b --yylineno --reentrant --bison-bridge --perf-report
-YACC = bison
-YFLAGS= -Dapi.pure -t -d -v --report=all
-
-BUILT_SOURCES += Jgrammar.c Jgrammar.h Jscanner.c
-Jgrammar.c: grammar.y
- $(YACC) $(YFLAGS) -o $@ $<
-Jscanner.c: scanner.l
- $(LEX) -R -o $@ $<
-json_SOURCES = Jgrammar.c Jscanner.c json.c
-
-testjson: json1.js json
- ./json json1.js
-
-BUILT_SOURCES += Qgrammar.c Qgrammar.h Qscanner.c
-Qgrammar.c: qf.y
- $(YACC) $(YFLAGS) -o $@ $<
-Qscanner.c: qf.l
- $(LEX) -R -o $@ $<
-qfcalc_SOURCES = Qgrammar.c Qscanner.c interpreter.c
-qfgraph_SOURCES = Qgrammar.c Qscanner.c graph.c
-
-testqf: qfcalc qfgraph
- ./qfcalc < qf.inp
- ./qfgraph < qf.inp
-
-BUILT_SOURCES += Tgrammar.c Tgrammar.h Tscanner.c
-Tgrammar.c Tgrammar.h: tqf.y
- $(YACC) $(YFLAGS) -o $@ $<
-Tscanner.c Tscanner.h: tqf.l
- $(LEX) --prefix="Tyy" $(LFLAGS) -o $@ $<
-tqf_SOURCES = Tgrammar.c Tscanner.c tgraph.c
-tqf_CFLAGS = $(CFLAGS) -fsanitize=address # -DTSCANNER_MAIN
-tqf_LDADD = ../lib/librpm.la \
- ./librpmdb.la \
- ../popt/libpopt.la
-
-testdir = $(abs_top_builddir)/tests
-foo: tqf
- -../libtool --mode=execute \
- ./tqf \
- --dbpath=$(testdir) \
- -r $(testdir)/fodder/*.rpm \
- $(testdir)/fodder/fmtmod.qf
+#tjfn_SOURCES = tjfn.c
+#tjfn_LDADD = $(mylibs)
+#
+#LFLAGS= -d -T -v -8 -b --yylineno --reentrant --bison-bridge --perf-report
+#
+#BUILT_SOURCES += Jgrammar.c Jgrammar.h Jscanner.c
+#Jgrammar.c Jgrammar.h: grammar.y
+# $(YACC) $(YFLAGS) -t -d -v -o $@ $<
+#Jscanner.c: scanner.l
+# $(LEX) -R -o $@ $<
+#json_SOURCES = Jgrammar.c Jscanner.c json.c
+#
+#testjson: json1.js json
+# ./json json1.js
+#
+#BUILT_SOURCES += Tgrammar.c Tgrammar.h Tscanner.c
+#Tgrammar.c Tgrammar.h: tqf.y
+# $(YACC) $(YFLAGS) -t -d -v -o $@ $<
+#Tscanner.c Tscanner.h: tqf.l
+# $(LEX) --prefix="Tyy" $(LFLAGS) -o $@ $<
+#tqf_SOURCES = Tgrammar.c Tscanner.c tgraph.c
+#tqf_CFLAGS = $(CFLAGS) -fsanitize=address # -DTSCANNER_MAIN
+#tqf_LDADD = ../lib/librpm.la \
+# ./librpmdb.la \
+# ../popt/libpopt.la
+
+#testdir = $(abs_top_builddir)/tests
+#foo: tqf
+# -../libtool --mode=execute \
+# ./tqf \
+# --dbpath=$(testdir) \
+# -r $(testdir)/fodder/*.rpm \
+# $(testdir)/fodder/fmtmod.qf
#tbdb_SOURCES = tbdb.c bdb.c
#tbdb_LDADD = $(mylibs)
Index: rpm/configure.ac
===================================================================
--- rpm.orig/configure.ac
+++ rpm/configure.ac
@@ -119,6 +119,7 @@ AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
AC_PROG_RANLIB
AC_PROG_YACC
+AM_PROG_LEX
AC_PATH_PROG(AS, as, as)
|
