diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-07-05 20:49:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-06 22:55:02 +0100 |
commit | 5fc11ac1700fab9ddb4437e2ee9514767387a5a9 (patch) | |
tree | c5af631080c5929c802e046b6af49ee3bea3e3e5 /meta/recipes-devtools | |
parent | 616075eca3de005d2eafffae63d53468ae72c7bb (diff) | |
download | poky-5fc11ac1700fab9ddb4437e2ee9514767387a5a9.tar.gz |
quilt.inc: avoid using += with an over-ride (drop unmaintained darwin support)
Using += with an over-ride can be a source of confusion so try to
avoid the construct in core recipes.
In this case, the _darwin over-ride seems to be unmaintained. It was
added in early 2013 but has not been accounted for in subsequent
updates to the recipe and (from inspection) now appears to be broken.
Remove the _darwin over-ride rather than try to debug or fix it.
(From OE-Core rev: 74e87700f4eb8c96aa7db3c722dd122c7e6f4bd6)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index c7bb741b4c..ff94cc99fa 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -16,10 +16,6 @@ SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa | |||
16 | 16 | ||
17 | inherit autotools-brokensep ptest | 17 | inherit autotools-brokensep ptest |
18 | 18 | ||
19 | EXTRA_OECONF_darwin += "--without-date \ | ||
20 | --without-getopt \ | ||
21 | " | ||
22 | |||
23 | CLEANBROKEN = "1" | 19 | CLEANBROKEN = "1" |
24 | 20 | ||
25 | PACKAGES += "guards guards-doc" | 21 | PACKAGES += "guards guards-doc" |
@@ -31,9 +27,6 @@ FILES_guards-doc = "${mandir}/man1/guards.1" | |||
31 | 27 | ||
32 | RDEPENDS_${PN} = "bash" | 28 | RDEPENDS_${PN} = "bash" |
33 | 29 | ||
34 | EXTRA_OE_MAKE_ARGS_darwin ?= "" | ||
35 | EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" | ||
36 | |||
37 | EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" | 30 | EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" |
38 | 31 | ||
39 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" | 32 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" |
@@ -51,7 +44,7 @@ do_configure_append () { | |||
51 | 44 | ||
52 | # quilt ignores DESTDIR | 45 | # quilt ignores DESTDIR |
53 | do_install () { | 46 | do_install () { |
54 | oe_runmake ${EXTRA_OE_MAKE_ARGS} install | 47 | oe_runmake 'BUILD_ROOT=${D}' install |
55 | # cleanup unpackaged files | 48 | # cleanup unpackaged files |
56 | rm -rf ${D}/${datadir}/emacs | 49 | rm -rf ${D}/${datadir}/emacs |
57 | } | 50 | } |