blob: 46065bc513188a2b19d4907a5d60330530faee03 [file] [log] [blame]
Brad Bishop08902b02019-08-20 09:16:51 -04001From 6cfa9f8126c1d6ec26f120d273e714fb19108873 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 4 Aug 2019 16:32:41 -0700
4Subject: [PATCH] Include config.h
5
6This helps avoid the include conflicts where <stdlib.h> is including
7<math.h> and since -I./lib is used and a local math.h wrapper is
8residing in there, the build breaks since stdlib.h really wants the
9standard system math.h to be included, this ensures that right macros
10are predefined and included before stdlib.h is included
11
12fixes
13In file included from src/libs/libgroff/assert.cpp:20:
14In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-r0/recipe-sysroot/usr/include/c++/v1/stdlib.h:100:
15./lib/math.h:38:3: error: "Please include config.h first."
16 #error "Please include config.h first."
17 ^
18./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN'
19
Andrew Geissler9b4d8b02021-02-19 12:26:16 -060020We delete eqn.cpp and qen.hpp in do_configure
21to ensure they're regenerated and deterministic.
22
Brad Bishop08902b02019-08-20 09:16:51 -040023Upstream-Status: Pending
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25---
26 src/libs/libgroff/assert.cpp | 4 +
27 src/libs/libgroff/curtime.cpp | 4 +
28 src/libs/libgroff/device.cpp | 4 +
29 src/libs/libgroff/error.cpp | 4 +
30 src/libs/libgroff/fatal.cpp | 4 +
31 src/libs/libgroff/string.cpp | 4 +
32 src/libs/libgroff/strsave.cpp | 4 +
33 src/preproc/eqn/eqn.cpp | 450 ++++++++++++++++++----------------
34 src/preproc/eqn/eqn.hpp | 12 +-
35 src/preproc/eqn/eqn.ypp | 4 +
36 src/preproc/eqn/other.cpp | 4 +
37 src/preproc/eqn/text.cpp | 4 +
38 src/preproc/pic/object.cpp | 4 +
39 13 files changed, 285 insertions(+), 221 deletions(-)
40
41diff --git a/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp
42index aceed05..97780d6 100644
43--- a/src/libs/libgroff/assert.cpp
44+++ b/src/libs/libgroff/assert.cpp
45@@ -16,6 +16,10 @@ for more details.
46 You should have received a copy of the GNU General Public License
47 along with this program. If not, see <http://www.gnu.org/licenses/>. */
48
49+#if HAVE_CONFIG_H
50+# include <config.h>
51+#endif
52+
53 #include <stdio.h>
54 #include <stdlib.h>
55 #include "assert.h"
56diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp
57index 72fe067..9ddba08 100644
58--- a/src/libs/libgroff/curtime.cpp
59+++ b/src/libs/libgroff/curtime.cpp
60@@ -15,6 +15,10 @@ for more details.
61 The GNU General Public License version 2 (GPL2) is available in the
62 internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */
63
64+#if HAVE_CONFIG_H
65+# include <config.h>
66+#endif
67+
68 #include <errno.h>
69 #include <limits.h>
70 #include <stdlib.h>
71diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
72index 0d28b85..c211f85 100644
73--- a/src/libs/libgroff/device.cpp
74+++ b/src/libs/libgroff/device.cpp
75@@ -17,6 +17,10 @@ for more details.
76 You should have received a copy of the GNU General Public License
77 along with this program. If not, see <http://www.gnu.org/licenses/>. */
78
79+#if HAVE_CONFIG_H
80+# include <config.h>
81+#endif
82+
83 #include <stdlib.h>
84 #include "device.h"
85 #include "defs.h"
86diff --git a/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp
87index 9a18803..7b63d3d 100644
88--- a/src/libs/libgroff/error.cpp
89+++ b/src/libs/libgroff/error.cpp
90@@ -17,6 +17,10 @@ for more details.
91 You should have received a copy of the GNU General Public License
92 along with this program. If not, see <http://www.gnu.org/licenses/>. */
93
94+#if HAVE_CONFIG_H
95+# include <config.h>
96+#endif
97+
98 #include <stdio.h>
99 #include <stdlib.h>
100 #include <string.h>
101diff --git a/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp
102index c0dcb35..fd6003e 100644
103--- a/src/libs/libgroff/fatal.cpp
104+++ b/src/libs/libgroff/fatal.cpp
105@@ -16,6 +16,10 @@ for more details.
106 You should have received a copy of the GNU General Public License
107 along with this program. If not, see <http://www.gnu.org/licenses/>. */
108
109+#if HAVE_CONFIG_H
110+# include <config.h>
111+#endif
112+
113 #include <stdlib.h>
114
115 #define FATAL_ERROR_EXIT_CODE 3
116diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
117index 46c015c..449f3a6 100644
118--- a/src/libs/libgroff/string.cpp
119+++ b/src/libs/libgroff/string.cpp
120@@ -17,6 +17,10 @@ for more details.
121 You should have received a copy of the GNU General Public License
122 along with this program. If not, see <http://www.gnu.org/licenses/>. */
123
124+#if HAVE_CONFIG_H
125+# include <config.h>
126+#endif
127+
128 #include <stdlib.h>
129
130 #include "lib.h"
131diff --git a/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp
132index f95c05e..d875045 100644
133--- a/src/libs/libgroff/strsave.cpp
134+++ b/src/libs/libgroff/strsave.cpp
135@@ -17,6 +17,10 @@ for more details.
136 You should have received a copy of the GNU General Public License
137 along with this program. If not, see <http://www.gnu.org/licenses/>. */
138
139+#if HAVE_CONFIG_H
140+# include <config.h>
141+#endif
142+
143 #include <string.h>
144 #include <stdlib.h>
145
Brad Bishop08902b02019-08-20 09:16:51 -0400146diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp
147index fb318c3..b7b647e 100644
148--- a/src/preproc/eqn/eqn.ypp
149+++ b/src/preproc/eqn/eqn.ypp
150@@ -16,6 +16,10 @@ for more details.
151 You should have received a copy of the GNU General Public License
152 along with this program. If not, see <http://www.gnu.org/licenses/>. */
153 %{
154+#if HAVE_CONFIG_H
155+# include <config.h>
156+#endif
157+
158 #include <stdio.h>
159 #include <string.h>
160 #include <stdlib.h>
161diff --git a/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp
162index 8db993f..38db396 100644
163--- a/src/preproc/eqn/other.cpp
164+++ b/src/preproc/eqn/other.cpp
165@@ -17,6 +17,10 @@ for more details.
166 You should have received a copy of the GNU General Public License
167 along with this program. If not, see <http://www.gnu.org/licenses/>. */
168
169+#if HAVE_CONFIG_H
170+# include <config.h>
171+#endif
172+
173 #include <stdlib.h>
174
175 #include "eqn.h"
176diff --git a/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp
177index f3d06f9..3b244d5 100644
178--- a/src/preproc/eqn/text.cpp
179+++ b/src/preproc/eqn/text.cpp
180@@ -17,6 +17,10 @@ for more details.
181 You should have received a copy of the GNU General Public License
182 along with this program. If not, see <http://www.gnu.org/licenses/>. */
183
184+#if HAVE_CONFIG_H
185+# include <config.h>
186+#endif
187+
188 #include <ctype.h>
189 #include <stdlib.h>
190 #include "eqn.h"
191diff --git a/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp
192index d8ba610..f26a831 100644
193--- a/src/preproc/pic/object.cpp
194+++ b/src/preproc/pic/object.cpp
195@@ -17,6 +17,10 @@ for more details.
196 You should have received a copy of the GNU General Public License
197 along with this program. If not, see <http://www.gnu.org/licenses/>. */
198
199+#if HAVE_CONFIG_H
200+# include <config.h>
201+#endif
202+
203 #include <stdlib.h>
204
205 #include "pic.h"
206--
2072.22.0
208