]>
Commit | Line | Data |
---|---|---|
0e7ddf04 JB |
1 | --- gdb-12.1/gdb/Makefile.in.orig 2022-06-23 22:08:57.971168251 +0200 |
2 | +++ gdb-12.1/gdb/Makefile.in 2022-06-23 22:15:34.112355503 +0200 | |
3 | @@ -180,11 +180,11 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM | |
e28f2cc1 | 4 | LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC) |
1013231d | 5 | |
e28f2cc1 AM |
6 | # Where is the READLINE library? Typically in ../readline/readline. |
7 | -READLINE_DIR = ../readline/readline | |
1013231d | 8 | -READLINE_SRC = $(srcdir)/$(READLINE_DIR) |
1518aa58 AM |
9 | -READLINE = @READLINE@ |
10 | -READLINE_DEPS = @READLINE_DEPS@ | |
11 | -READLINE_CFLAGS = @READLINE_CFLAGS@ | |
1013231d AM |
12 | +READLINE_DIR = /usr/include/readline |
13 | +READLINE = -lreadline | |
14 | +READLINE_SRC = /usr/include/readline | |
1518aa58 | 15 | +READLINE_DEPS = |
1013231d AM |
16 | +READLINE_CFLAGS = -I/usr/include/readline |
17 | ||
1518aa58 AM |
18 | # Where is expat? This will be empty if expat was not available. |
19 | LIBEXPAT = @LIBEXPAT@ | |
0e7ddf04 | 20 | @@ -652,7 +652,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $( |
1d2a824d JP |
21 | $(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \ |
22 | $(LIBMPFR) $(LIBGMP) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ | |
0e7ddf04 | 23 | $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB) |
174fe25c JP |
24 | -CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ |
25 | +CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(CTF_DEPS) \ | |
26 | $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ | |
27 | $(LIBSUPPORT) | |
d2fe5bd3 | 28 | |
0e7ddf04 JB |
29 | --- gdb-12.1/Makefile.in.orig 2022-05-01 20:47:43.000000000 +0200 |
30 | +++ gdb-12.1/Makefile.in 2022-06-23 22:06:05.298770364 +0200 | |
31 | @@ -1087,7 +1087,6 @@ configure-host: \ | |
9f8b257d | 32 | maybe-configure-libiberty-linker-plugin \ |
f412e1b4 PS |
33 | maybe-configure-libiconv \ |
34 | maybe-configure-m4 \ | |
8ef65460 | 35 | - maybe-configure-readline \ |
f412e1b4 PS |
36 | maybe-configure-sid \ |
37 | maybe-configure-sim \ | |
38 | maybe-configure-texinfo \ | |
0e7ddf04 JB |
39 | @@ -1261,7 +1260,6 @@ all-host: maybe-all-libiberty-linker-plu |
40 | all-host: maybe-all-libiconv | |
41 | @endif libiconv-no-bootstrap | |
42 | all-host: maybe-all-m4 | |
43 | -all-host: maybe-all-readline | |
44 | all-host: maybe-all-sid | |
45 | all-host: maybe-all-sim | |
46 | all-host: maybe-all-texinfo | |
47 | @@ -1373,7 +1371,6 @@ info-host: maybe-info-libiberty | |
9f8b257d | 48 | info-host: maybe-info-libiberty-linker-plugin |
f412e1b4 PS |
49 | info-host: maybe-info-libiconv |
50 | info-host: maybe-info-m4 | |
9e3bef55 | 51 | -info-host: maybe-info-readline |
f412e1b4 PS |
52 | info-host: maybe-info-sid |
53 | info-host: maybe-info-sim | |
54 | info-host: maybe-info-texinfo | |
0e7ddf04 | 55 | @@ -1464,7 +1461,6 @@ dvi-host: maybe-dvi-libiberty |
9f8b257d | 56 | dvi-host: maybe-dvi-libiberty-linker-plugin |
f412e1b4 PS |
57 | dvi-host: maybe-dvi-libiconv |
58 | dvi-host: maybe-dvi-m4 | |
9e3bef55 | 59 | -dvi-host: maybe-dvi-readline |
f412e1b4 PS |
60 | dvi-host: maybe-dvi-sid |
61 | dvi-host: maybe-dvi-sim | |
62 | dvi-host: maybe-dvi-texinfo | |
0e7ddf04 | 63 | @@ -1555,7 +1551,6 @@ pdf-host: maybe-pdf-libiberty |
9f8b257d | 64 | pdf-host: maybe-pdf-libiberty-linker-plugin |
f412e1b4 PS |
65 | pdf-host: maybe-pdf-libiconv |
66 | pdf-host: maybe-pdf-m4 | |
67 | -pdf-host: maybe-pdf-readline | |
68 | pdf-host: maybe-pdf-sid | |
69 | pdf-host: maybe-pdf-sim | |
70 | pdf-host: maybe-pdf-texinfo | |
0e7ddf04 | 71 | @@ -1646,7 +1641,6 @@ html-host: maybe-html-libiberty |
9f8b257d | 72 | html-host: maybe-html-libiberty-linker-plugin |
f412e1b4 PS |
73 | html-host: maybe-html-libiconv |
74 | html-host: maybe-html-m4 | |
9e3bef55 | 75 | -html-host: maybe-html-readline |
f412e1b4 PS |
76 | html-host: maybe-html-sid |
77 | html-host: maybe-html-sim | |
78 | html-host: maybe-html-texinfo | |
0e7ddf04 | 79 | @@ -1737,7 +1731,6 @@ TAGS-host: maybe-TAGS-libiberty |
9f8b257d | 80 | TAGS-host: maybe-TAGS-libiberty-linker-plugin |
f412e1b4 PS |
81 | TAGS-host: maybe-TAGS-libiconv |
82 | TAGS-host: maybe-TAGS-m4 | |
83 | -TAGS-host: maybe-TAGS-readline | |
84 | TAGS-host: maybe-TAGS-sid | |
85 | TAGS-host: maybe-TAGS-sim | |
86 | TAGS-host: maybe-TAGS-texinfo | |
0e7ddf04 | 87 | @@ -1828,7 +1821,6 @@ install-info-host: maybe-install-info-li |
9f8b257d | 88 | install-info-host: maybe-install-info-libiberty-linker-plugin |
f412e1b4 PS |
89 | install-info-host: maybe-install-info-libiconv |
90 | install-info-host: maybe-install-info-m4 | |
9e3bef55 | 91 | -install-info-host: maybe-install-info-readline |
f412e1b4 PS |
92 | install-info-host: maybe-install-info-sid |
93 | install-info-host: maybe-install-info-sim | |
94 | install-info-host: maybe-install-info-texinfo | |
0e7ddf04 JB |
95 | @@ -1919,7 +1911,6 @@ install-dvi-host: maybe-install-dvi-libi |
96 | install-dvi-host: maybe-install-dvi-libiberty-linker-plugin | |
97 | install-dvi-host: maybe-install-dvi-libiconv | |
98 | install-dvi-host: maybe-install-dvi-m4 | |
99 | -install-dvi-host: maybe-install-dvi-readline | |
100 | install-dvi-host: maybe-install-dvi-sid | |
101 | install-dvi-host: maybe-install-dvi-sim | |
102 | install-dvi-host: maybe-install-dvi-texinfo | |
103 | @@ -2010,7 +2001,6 @@ install-pdf-host: maybe-install-pdf-libi | |
9f8b257d | 104 | install-pdf-host: maybe-install-pdf-libiberty-linker-plugin |
f412e1b4 PS |
105 | install-pdf-host: maybe-install-pdf-libiconv |
106 | install-pdf-host: maybe-install-pdf-m4 | |
107 | -install-pdf-host: maybe-install-pdf-readline | |
108 | install-pdf-host: maybe-install-pdf-sid | |
109 | install-pdf-host: maybe-install-pdf-sim | |
110 | install-pdf-host: maybe-install-pdf-texinfo | |
0e7ddf04 | 111 | @@ -2101,7 +2091,6 @@ install-html-host: maybe-install-html-li |
9f8b257d | 112 | install-html-host: maybe-install-html-libiberty-linker-plugin |
f412e1b4 PS |
113 | install-html-host: maybe-install-html-libiconv |
114 | install-html-host: maybe-install-html-m4 | |
9e3bef55 | 115 | -install-html-host: maybe-install-html-readline |
f412e1b4 PS |
116 | install-html-host: maybe-install-html-sid |
117 | install-html-host: maybe-install-html-sim | |
118 | install-html-host: maybe-install-html-texinfo | |
0e7ddf04 | 119 | @@ -2192,7 +2181,6 @@ installcheck-host: maybe-installcheck-li |
9f8b257d | 120 | installcheck-host: maybe-installcheck-libiberty-linker-plugin |
f412e1b4 PS |
121 | installcheck-host: maybe-installcheck-libiconv |
122 | installcheck-host: maybe-installcheck-m4 | |
9e3bef55 | 123 | -installcheck-host: maybe-installcheck-readline |
f412e1b4 PS |
124 | installcheck-host: maybe-installcheck-sid |
125 | installcheck-host: maybe-installcheck-sim | |
126 | installcheck-host: maybe-installcheck-texinfo | |
0e7ddf04 | 127 | @@ -2283,7 +2271,6 @@ mostlyclean-host: maybe-mostlyclean-libi |
9f8b257d | 128 | mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin |
f412e1b4 PS |
129 | mostlyclean-host: maybe-mostlyclean-libiconv |
130 | mostlyclean-host: maybe-mostlyclean-m4 | |
9e3bef55 | 131 | -mostlyclean-host: maybe-mostlyclean-readline |
f412e1b4 PS |
132 | mostlyclean-host: maybe-mostlyclean-sid |
133 | mostlyclean-host: maybe-mostlyclean-sim | |
134 | mostlyclean-host: maybe-mostlyclean-texinfo | |
0e7ddf04 | 135 | @@ -2374,7 +2361,6 @@ clean-host: maybe-clean-libiberty |
9f8b257d | 136 | clean-host: maybe-clean-libiberty-linker-plugin |
f412e1b4 PS |
137 | clean-host: maybe-clean-libiconv |
138 | clean-host: maybe-clean-m4 | |
9e3bef55 | 139 | -clean-host: maybe-clean-readline |
f412e1b4 PS |
140 | clean-host: maybe-clean-sid |
141 | clean-host: maybe-clean-sim | |
142 | clean-host: maybe-clean-texinfo | |
0e7ddf04 | 143 | @@ -2465,7 +2451,6 @@ distclean-host: maybe-distclean-libibert |
9f8b257d | 144 | distclean-host: maybe-distclean-libiberty-linker-plugin |
f412e1b4 PS |
145 | distclean-host: maybe-distclean-libiconv |
146 | distclean-host: maybe-distclean-m4 | |
9e3bef55 | 147 | -distclean-host: maybe-distclean-readline |
f412e1b4 PS |
148 | distclean-host: maybe-distclean-sid |
149 | distclean-host: maybe-distclean-sim | |
150 | distclean-host: maybe-distclean-texinfo | |
0e7ddf04 | 151 | @@ -2556,7 +2541,6 @@ maintainer-clean-host: maybe-maintainer- |
9f8b257d | 152 | maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin |
f412e1b4 PS |
153 | maintainer-clean-host: maybe-maintainer-clean-libiconv |
154 | maintainer-clean-host: maybe-maintainer-clean-m4 | |
9e3bef55 | 155 | -maintainer-clean-host: maybe-maintainer-clean-readline |
f412e1b4 PS |
156 | maintainer-clean-host: maybe-maintainer-clean-sid |
157 | maintainer-clean-host: maybe-maintainer-clean-sim | |
158 | maintainer-clean-host: maybe-maintainer-clean-texinfo | |
0e7ddf04 | 159 | @@ -2705,7 +2689,6 @@ check-host: \ |
9f8b257d | 160 | maybe-check-libiberty-linker-plugin \ |
f412e1b4 PS |
161 | maybe-check-libiconv \ |
162 | maybe-check-m4 \ | |
8ef65460 | 163 | - maybe-check-readline \ |
f412e1b4 PS |
164 | maybe-check-sid \ |
165 | maybe-check-sim \ | |
166 | maybe-check-texinfo \ | |
0e7ddf04 | 167 | @@ -2843,7 +2826,6 @@ install-host-nogcc: \ |
9f8b257d | 168 | maybe-install-libiberty-linker-plugin \ |
f412e1b4 PS |
169 | maybe-install-libiconv \ |
170 | maybe-install-m4 \ | |
8ef65460 | 171 | - maybe-install-readline \ |
f412e1b4 PS |
172 | maybe-install-sid \ |
173 | maybe-install-sim \ | |
174 | maybe-install-texinfo \ | |
0e7ddf04 | 175 | @@ -2899,7 +2881,6 @@ install-host: \ |
9f8b257d | 176 | maybe-install-libiberty-linker-plugin \ |
f412e1b4 PS |
177 | maybe-install-libiconv \ |
178 | maybe-install-m4 \ | |
8ef65460 | 179 | - maybe-install-readline \ |
f412e1b4 PS |
180 | maybe-install-sid \ |
181 | maybe-install-sim \ | |
182 | maybe-install-texinfo \ | |
0e7ddf04 | 183 | @@ -3010,7 +2991,6 @@ install-strip-host: \ |
9f8b257d | 184 | maybe-install-strip-libiberty-linker-plugin \ |
f412e1b4 PS |
185 | maybe-install-strip-libiconv \ |
186 | maybe-install-strip-m4 \ | |
187 | - maybe-install-strip-readline \ | |
188 | maybe-install-strip-sid \ | |
189 | maybe-install-strip-sim \ | |
190 | maybe-install-strip-texinfo \ | |
0e7ddf04 | 191 | @@ -63072,7 +63052,6 @@ configure-gdb: maybe-all-gnulib |
174fe25c | 192 | configure-gdb: maybe-all-gdbsupport |
e28f2cc1 | 193 | all-gdb: maybe-all-gnulib |
174fe25c | 194 | all-gdb: maybe-all-gdbsupport |
9b6000ea JB |
195 | -all-gdb: maybe-all-readline |
196 | all-gdb: maybe-all-build-bison | |
9b6000ea | 197 | all-gdb: maybe-all-sim |
ed003b1c | 198 | all-gdb: maybe-all-libtermcap |
0e7ddf04 | 199 | @@ -63562,7 +63541,6 @@ install-strip-sid: maybe-install-strip-t |
ed003b1c AM |
200 | install-sid: maybe-install-tk |
201 | install-strip-sid: maybe-install-strip-tk | |
1d2a824d | 202 | configure-sim: maybe-all-gnulib |
0e7ddf04 | 203 | -configure-sim: maybe-all-readline |
9b6000ea | 204 | all-fastjar: maybe-all-build-texinfo |
e28f2cc1 | 205 | all-libctf: all-libiberty |
1d2a824d | 206 | all-stage1-libctf: all-stage1-libiberty |