mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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>
This commit is contained in:
Hongxu Jia
committed by
Richard Purdie
Richard Purdie
parent
8e7b9685d2
commit
66d67b818a
@@ -0,0 +1,31 @@
|
||||
From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Sat, 11 May 2019 19:19:27 +0800
|
||||
Subject: [PATCH] fix shebang for target
|
||||
|
||||
...
|
||||
|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
|
||||
package groff requires tmp-glibc/hosttools/bash, but no providers found in
|
||||
RDEPENDS_groff? [file-rdeps]
|
||||
...
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
contrib/gdiffmk/gdiffmk.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
|
||||
index 5ce931e..10f2300 100644
|
||||
--- a/contrib/gdiffmk/gdiffmk.sh
|
||||
+++ b/contrib/gdiffmk/gdiffmk.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!@BASH_PROG@
|
||||
+#!/bin/sh
|
||||
# Copyright (C) 2004-2018 Free Software Foundation, Inc.
|
||||
# Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
|
||||
# Thanks to Peter Bray for debugging.
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001
|
||||
From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Thu, 6 Apr 2017 01:46:00 -0700
|
||||
Subject: [PATCH] replace "perl -w" with "use warnings"
|
||||
Date: Sat, 11 May 2019 17:03:03 +0800
|
||||
Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
|
||||
|
||||
The shebang's max length is usually 128 as defined in
|
||||
/usr/include/linux/binfmts.h:
|
||||
@@ -18,6 +18,10 @@ So replace "perl -w" with "use warnings" to make it work.
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
|
||||
Rebase to 1.22.4.
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
font/devpdf/util/BuildFoundries.pl | 3 ++-
|
||||
src/devices/gropdf/gropdf.pl | 3 ++-
|
||||
@@ -26,7 +30,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
4 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
|
||||
index 39f2f0d..a2bfd8e 100644
|
||||
index f8af826..9584e28 100644
|
||||
--- a/font/devpdf/util/BuildFoundries.pl
|
||||
+++ b/font/devpdf/util/BuildFoundries.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -36,15 +40,15 @@ index 39f2f0d..a2bfd8e 100644
|
||||
# BuildFoundries : Given a Foundry file generate groff and download files
|
||||
# Deri James : Monday 07 Feb 2011
|
||||
@@ -22,6 +22,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use strict;
|
||||
+use warnings;
|
||||
|
||||
(my $progname = $0) =~s @.*/@@;
|
||||
my $where=shift||'';
|
||||
my $devps=shift||'../devps';
|
||||
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
|
||||
index 035d123..b933b32 100644
|
||||
index 2ec52d0..ce5a06f 100644
|
||||
--- a/src/devices/gropdf/gropdf.pl
|
||||
+++ b/src/devices/gropdf/gropdf.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -59,10 +63,10 @@ index 035d123..b933b32 100644
|
||||
use strict;
|
||||
+use warnings;
|
||||
use Getopt::Long qw(:config bundling);
|
||||
use Compress::Zlib;
|
||||
|
||||
use constant
|
||||
diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
|
||||
index beec820..4b46ea4 100644
|
||||
index c9b08b2..61124f3 100644
|
||||
--- a/src/devices/gropdf/pdfmom.pl
|
||||
+++ b/src/devices/gropdf/pdfmom.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -71,8 +75,8 @@ index beec820..4b46ea4 100644
|
||||
#
|
||||
# pdfmom : Frontend to run groff -mom to produce PDFs
|
||||
# Deri James : Friday 16 Mar 2012
|
||||
@@ -24,6 +24,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
@@ -23,6 +23,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use strict;
|
||||
+use warnings;
|
||||
@@ -80,17 +84,17 @@ index beec820..4b46ea4 100644
|
||||
my @cmd;
|
||||
my $dev='pdf';
|
||||
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
|
||||
index 4f2ce83..5c078ff 100644
|
||||
index 954c58e..81a6c97 100644
|
||||
--- a/src/utils/afmtodit/afmtodit.pl
|
||||
+++ b/src/utils/afmtodit/afmtodit.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/perl -w
|
||||
+#! /usr/bin/perl
|
||||
# -*- Perl -*-
|
||||
# Copyright (C) 1989-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1989-2018 Free Software Foundation, Inc.
|
||||
# Written by James Clark (jjc@jclark.com)
|
||||
@@ -19,6 +19,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use strict;
|
||||
+use warnings;
|
||||
@@ -98,5 +102,5 @@ index 4f2ce83..5c078ff 100644
|
||||
@afmtodit.tables@
|
||||
|
||||
--
|
||||
2.10.2
|
||||
2.7.4
|
||||
|
||||
46
meta/recipes-extended/groff/files/0001-support-musl.patch
Normal file
46
meta/recipes-extended/groff/files/0001-support-musl.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From f73df5196c35ef9c4531e4b6b26800c41954fd77 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Sat, 11 May 2019 20:00:29 +0800
|
||||
Subject: [PATCH] support musl
|
||||
|
||||
...
|
||||
|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration
|
||||
| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36,
|
||||
| from ./lib/math.h:27,
|
||||
| from ./src/include/driver.h:27,
|
||||
| from src/devices/grodvi/dvi.cpp:20:
|
||||
|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)'
|
||||
| signbit(float __x)
|
||||
| ^~~~~~~
|
||||
...
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
lib/math.in.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/math.in.h b/lib/math.in.h
|
||||
index c30fc20..16e406a 100644
|
||||
--- a/lib/math.in.h
|
||||
+++ b/lib/math.in.h
|
||||
@@ -2397,11 +2397,13 @@ _GL_EXTERN_C int gl_signbitl (long double arg);
|
||||
gl_signbitf (x))
|
||||
# endif
|
||||
# ifdef __cplusplus
|
||||
+#if defined(__GLIBC__)
|
||||
# if defined signbit || defined GNULIB_NAMESPACE
|
||||
_GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit)
|
||||
# undef signbit
|
||||
_GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
|
||||
# endif
|
||||
+# endif //if defined(__GLIBC__)
|
||||
# endif
|
||||
#elif defined GNULIB_POSIXCHECK
|
||||
# if defined signbit
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Sat, 11 May 2019 17:06:29 +0800
|
||||
Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on
|
||||
build host. It causes non-determinism issue. So not search font dirs on host.
|
||||
|
||||
Upstream-Status: Inappropriate [cross build specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
Rebase to 1.22.4
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
font/devpdf/Foundry.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
|
||||
index 93e9b66..235b23b 100644
|
||||
--- a/font/devpdf/Foundry.in
|
||||
+++ b/font/devpdf/Foundry.in
|
||||
@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
|
||||
#======================================================================
|
||||
|
||||
#Foundry|Name|Searchpath
|
||||
-foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
|
||||
+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
|
||||
#Define Flags for afmtodit
|
||||
|
||||
r=-i 0 -m
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 17:02:13 -0700
|
||||
Subject: [PATCH] Unset need_charset_alias when building for musl
|
||||
|
||||
localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
|
||||
which actually shoudl be fixed in gnulib and then all downstream
|
||||
projects will get it eventually. For now we apply the fix to
|
||||
coreutils
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/gnulib.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
|
||||
===================================================================
|
||||
--- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
|
||||
+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
|
||||
@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
|
||||
case '$(host_os)' in \
|
||||
darwin[56]*) \
|
||||
need_charset_alias=true ;; \
|
||||
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
|
||||
+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
|
||||
need_charset_alias=false ;; \
|
||||
*) \
|
||||
need_charset_alias=true ;; \
|
||||
@@ -1,34 +0,0 @@
|
||||
Correct the install path of man.local to fix following error:
|
||||
/yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
|
||||
|
||||
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
|
||||
index 1506232..f1468c5 100644
|
||||
--- a/tmac/Makefile.sub
|
||||
+++ b/tmac/Makefile.sub
|
||||
@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
|
||||
$(RM) $(DESTDIR)$(mdocdir)/$$f; \
|
||||
$(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
|
||||
done
|
||||
- -test -f $(DESTDIR)$(localtmacdir)/man.local \
|
||||
+ -test -f $(DESTDIR)$(tmacdir)/man.local \
|
||||
|| $(INSTALL_DATA) $(srcdir)/man.local \
|
||||
- $(DESTDIR)$(localtmacdir)/man.local
|
||||
+ $(DESTDIR)$(tmacdir)/man.local
|
||||
-test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
|
||||
|| $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
|
||||
|
||||
@@ -164,9 +164,9 @@ uninstall_sub:
|
||||
$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
|
||||
$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
|
||||
$(RM) $(DESTDIR)$(tmacdir)/www.tmac
|
||||
- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
|
||||
+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
|
||||
$(srcdir)/man.local; then \
|
||||
- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
|
||||
+ $(RM) $(DESTDIR)$(tmacdir)/man.local; \
|
||||
fi
|
||||
-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
|
||||
$(srcdir)/mdoc.local; then \
|
||||
@@ -1,20 +0,0 @@
|
||||
groff searchs fonts which are provided by ghostscript on build host.
|
||||
It causes non-determinism issue. So not search font dirs on host.
|
||||
|
||||
Upstream-Status: Inappropriate [cross build specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
|
||||
index a6e968f..8094642 100644
|
||||
--- a/font/devpdf/Foundry.in
|
||||
+++ b/font/devpdf/Foundry.in
|
||||
@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
|
||||
#======================================================================
|
||||
|
||||
#Foundry|Name|Searchpath
|
||||
-foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
|
||||
+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
|
||||
#Define Flags for afmtodit
|
||||
|
||||
r=-i 0 -m
|
||||
@@ -8,49 +8,27 @@ LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
|
||||
file://groff-1.22.2-correct-man.local-install-path.patch \
|
||||
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
|
||||
file://0001-replace-perl-w-with-use-warnings.patch \
|
||||
file://groff-not-search-fonts-on-build-host.patch \
|
||||
file://0001-fix-shebang-for-taget.patch \
|
||||
file://0001-support-musl.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
|
||||
SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
|
||||
SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
|
||||
SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
|
||||
|
||||
DEPENDS = "groff-native"
|
||||
DEPENDS_class-native = ""
|
||||
DEPENDS = "bison-native"
|
||||
RDEPENDS_${PN} += "perl sed"
|
||||
|
||||
inherit autotools texinfo multilib_script
|
||||
inherit autotools-brokensep texinfo multilib_script pkgconfig
|
||||
|
||||
MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
|
||||
|
||||
EXTRA_OECONF = "--without-x"
|
||||
EXTRA_OECONF = "--without-x --without-doc"
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
|
||||
|
||||
do_configure_prepend() {
|
||||
if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
|
||||
sed -i \
|
||||
-e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
|
||||
-e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
|
||||
-e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
|
||||
-e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
|
||||
${S}/contrib/*/Makefile.sub \
|
||||
${S}/doc/Makefile.in \
|
||||
${S}/doc/Makefile.sub
|
||||
fi
|
||||
}
|
||||
|
||||
do_configure_append() {
|
||||
# generate gnulib configure script
|
||||
olddir=`pwd`
|
||||
cd ${S}/src/libs/gnulib/
|
||||
ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
|
||||
cd ${olddir}
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
|
||||
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
|
||||
Reference in New Issue
Block a user