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