diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-05-12 16:16:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-12 17:55:11 +0100 |
commit | 66d67b818a7bb172f9ab804f9cb5b8e5b9e577f5 (patch) | |
tree | 58781fb06cfb1889afe8cb1c5951125a35858ed4 /meta/recipes-extended/groff/files/0001-support-musl.patch | |
parent | 8e7b9685d2d27511aef2cf1ce51d688337fbd31a (diff) | |
download | poky-66d67b818a7bb172f9ab804f9cb5b8e5b9e577f5.tar.gz |
groff: upgrade 1.22.3 -> 1.22.4
- Drop groff-1.22.2-correct-man.local-install-path.patch and
0001-Unset-need_charset_alias-when-building-for-musl.patch
- Inherit bbclass pkgcnofig to fix `undefined macro: AC_DEFINE'
...
| configure:20010: error: possibly undefined macro: AC_DEFINE
...
- Use autotools-brokensep to replace autotools to workaround failure
caused by out of tree
...
| rm -f lib/alloca.h-t lib/alloca.h && \
| { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
| cat ../groff-1.22.4/lib/alloca.in.h; \
| } > lib/alloca.h-t && \
| mv -f lib/alloca.h-t lib/alloca.h
| /bin/sh: line 4: lib/alloca.h-t: No such file or directory
| Makefile:10407: recipe for target 'lib/alloca.h' failed
...
- Add `--without-doc' to not use target groff to generate doc at build time,
since upstream commit [cfe916e Support of configure option to build the
documentation.]
- Remove groff depends groff-native, and add DEPENDS bison-native
- Add 0001-fix-shebang-for-taget.patch
- Add 0001-support-musl.patch
(From OE-Core rev: 70c2364cae3aad62877e0267d840ea3567d3d1ea)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/groff/files/0001-support-musl.patch')
-rw-r--r-- | meta/recipes-extended/groff/files/0001-support-musl.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-extended/groff/files/0001-support-musl.patch b/meta/recipes-extended/groff/files/0001-support-musl.patch new file mode 100644 index 0000000000..e5c817c209 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-support-musl.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From f73df5196c35ef9c4531e4b6b26800c41954fd77 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Sat, 11 May 2019 20:00:29 +0800 | ||
4 | Subject: [PATCH] support musl | ||
5 | |||
6 | ... | ||
7 | |./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration | ||
8 | | _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit) | ||
9 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
10 | |In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36, | ||
11 | | from ./lib/math.h:27, | ||
12 | | from ./src/include/driver.h:27, | ||
13 | | from src/devices/grodvi/dvi.cpp:20: | ||
14 | |recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)' | ||
15 | | signbit(float __x) | ||
16 | | ^~~~~~~ | ||
17 | ... | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
22 | --- | ||
23 | lib/math.in.h | 2 ++ | ||
24 | 1 file changed, 2 insertions(+) | ||
25 | |||
26 | diff --git a/lib/math.in.h b/lib/math.in.h | ||
27 | index c30fc20..16e406a 100644 | ||
28 | --- a/lib/math.in.h | ||
29 | +++ b/lib/math.in.h | ||
30 | @@ -2397,11 +2397,13 @@ _GL_EXTERN_C int gl_signbitl (long double arg); | ||
31 | gl_signbitf (x)) | ||
32 | # endif | ||
33 | # ifdef __cplusplus | ||
34 | +#if defined(__GLIBC__) | ||
35 | # if defined signbit || defined GNULIB_NAMESPACE | ||
36 | _GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit) | ||
37 | # undef signbit | ||
38 | _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit) | ||
39 | # endif | ||
40 | +# endif //if defined(__GLIBC__) | ||
41 | # endif | ||
42 | #elif defined GNULIB_POSIXCHECK | ||
43 | # if defined signbit | ||
44 | -- | ||
45 | 2.7.4 | ||
46 | |||