summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt/quilt.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-16 15:00:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-17 10:19:59 +0000
commit821a6f2a170cfcaf8fe51240a2558ae06328a998 (patch)
tree45976a803a68470f3195b665ac536336a418aa38 /meta/recipes-devtools/quilt/quilt.inc
parenteea86c4f0a960d0094571a78dc0cf9d46d162a22 (diff)
downloadpoky-821a6f2a170cfcaf8fe51240a2558ae06328a998.tar.gz
quilt: Merge recipe files into a more coherent form
The style of this recipe is dated, move most of the code into the main shared include file, making some of the configuration much clearer using modern overrides to do so. (From OE-Core rev: b422d94b1b42fd3be42fd1ba95dbcab10e2ab4ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt.inc')
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc21
1 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 48ed9babf7..150df3d572 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -11,14 +11,21 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
11 file://0001-tests-Allow-different-output-from-mv.patch \ 11 file://0001-tests-Allow-different-output-from-mv.patch \
12" 12"
13 13
14SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch"
15
14SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" 16SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
15SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819" 17SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819"
16 18
17inherit autotools-brokensep ptest 19inherit autotools-brokensep ptest
18 20
21INHIBIT_AUTOTOOLS_DEPS_class-native = "1"
22PATCHTOOL_class-native = "patch"
23
19CLEANBROKEN = "1" 24CLEANBROKEN = "1"
20 25
21EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" 26EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
27EXTRA_OECONF_append_class-native = " --disable-nls"
28EXTRA_AUTORECONF += "--exclude=aclocal"
22 29
23CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" 30CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
24 31
@@ -33,6 +40,10 @@ do_configure_append () {
33 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile 40 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile
34} 41}
35 42
43do_configure_class-native () {
44 oe_runconf
45}
46
36# quilt Makefiles install to BUILD_ROOT instead of DESTDIR 47# quilt Makefiles install to BUILD_ROOT instead of DESTDIR
37do_install () { 48do_install () {
38 oe_runmake 'BUILD_ROOT=${D}' install 49 oe_runmake 'BUILD_ROOT=${D}' install
@@ -40,6 +51,12 @@ do_install () {
40 rm -rf ${D}/${datadir}/emacs 51 rm -rf ${D}/${datadir}/emacs
41} 52}
42 53
54do_install_append_class-native () {
55 # Dummy quiltrc file for patch.bbclass
56 install -d ${D}${sysconfdir}/
57 touch ${D}${sysconfdir}/quiltrc
58}
59
43do_compile_ptest() { 60do_compile_ptest() {
44 oe_runmake bin/patch-wrapper test/.depend 61 oe_runmake bin/patch-wrapper test/.depend
45} 62}
@@ -61,7 +78,9 @@ FILES_guards = "${bindir}/guards"
61FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" 78FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
62FILES_guards-doc = "${mandir}/man1/guards.1" 79FILES_guards-doc = "${mandir}/man1/guards.1"
63 80
64RDEPENDS_${PN} = "bash" 81RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux"
82RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
83
65RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ 84RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
66 perl-module-filehandle perl-module-getopt-std \ 85 perl-module-filehandle perl-module-getopt-std \
67 perl-module-posix perl-module-file-temp \ 86 perl-module-posix perl-module-file-temp \