summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch31
-rw-r--r--meta/recipes-extended/groff/groff_1.22.4.bb3
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch b/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
deleted file mode 100644
index 1b94e8a937..0000000000
--- a/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 19:19:27 +0800
4Subject: [PATCH] fix shebang for target
5
6...
7|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
8package groff requires tmp-glibc/hosttools/bash, but no providers found in
9RDEPENDS_groff? [file-rdeps]
10...
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 contrib/gdiffmk/gdiffmk.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
20index 5ce931e..10f2300 100644
21--- a/contrib/gdiffmk/gdiffmk.sh
22+++ b/contrib/gdiffmk/gdiffmk.sh
23@@ -1,4 +1,4 @@
24-#!@BASH_PROG@
25+#!/bin/sh
26 # Copyright (C) 2004-2018 Free Software Foundation, Inc.
27 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
28 # Thanks to Peter Bray for debugging.
29--
302.7.4
31
diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb
index 37eee9a6cc..a190230b31 100644
--- a/meta/recipes-extended/groff/groff_1.22.4.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ 10SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
11 file://0001-replace-perl-w-with-use-warnings.patch \ 11 file://0001-replace-perl-w-with-use-warnings.patch \
12 file://groff-not-search-fonts-on-build-host.patch \ 12 file://groff-not-search-fonts-on-build-host.patch \
13 file://0001-fix-shebang-for-taget.patch \
14 file://0001-support-musl.patch \ 13 file://0001-support-musl.patch \
15" 14"
16 15
@@ -27,7 +26,7 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind
27EXTRA_OECONF = "--without-x --without-doc" 26EXTRA_OECONF = "--without-x --without-doc"
28PARALLEL_MAKE = "" 27PARALLEL_MAKE = ""
29 28
30CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" 29CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'"
31 30
32do_install_append() { 31do_install_append() {
33 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location 32 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location