Преглед изворни кода

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>
Andre McCurdy пре 7 година
родитељ
комит
5fc11ac170
1 измењених фајлова са 1 додато и 8 уклоњено
  1. 1 8
      meta/recipes-devtools/quilt/quilt.inc

+ 1 - 8
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
 }