From 74e87700f4eb8c96aa7db3c722dd122c7e6f4bd6 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Thu, 5 Jul 2018 20:49:05 -0700 Subject: 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. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt.inc | 9 +-------- 1 file changed, 1 insertion(+), 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 inherit autotools-brokensep ptest -EXTRA_OECONF_darwin += "--without-date \ - --without-getopt \ - " - CLEANBROKEN = "1" PACKAGES += "guards guards-doc" @@ -31,9 +27,6 @@ FILES_guards-doc = "${mandir}/man1/guards.1" RDEPENDS_${PN} = "bash" -EXTRA_OE_MAKE_ARGS_darwin ?= "" -EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" - EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" @@ -51,7 +44,7 @@ do_configure_append () { # quilt ignores DESTDIR do_install () { - oe_runmake ${EXTRA_OE_MAKE_ARGS} install + oe_runmake 'BUILD_ROOT=${D}' install # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } -- cgit 1.2.3-korg