Patchwork base.bbclass: add GNUmakefile to the list of possible makefile names

login
register
mail settings
Submitter Ross Burton
Date July 13, 2012, 11:01 a.m.
Message ID <1342177287-4348-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/31955/
State Accepted
Commit b753eab1028ba48dfdcdeefa07f3f30743f3ee45
Headers show

Comments

Ross Burton - July 13, 2012, 11:01 a.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Khem Raj - July 13, 2012, 6:43 p.m.
On Fri, Jul 13, 2012 at 4:01 AM, Ross Burton <ross.burton@intel.com> wrote:
>
> +       if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
>                 oe_runmake || die "make failed"
>         else
>                 bbnote "nothing to compile"

may be convert it into case .. esac ? while you  are at it
Saul Wold - July 17, 2012, 5:20 p.m.
On 07/13/2012 04:01 AM, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/classes/base.bbclass |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 08065c6..f691799 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -280,7 +280,7 @@ base_do_configure() {
>   addtask compile after do_configure
>   do_compile[dirs] = "${S} ${B}"
>   base_do_compile() {
> -	if [ -e Makefile -o -e makefile ]; then
> +	if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
>   		oe_runmake || die "make failed"
>   	else
>   		bbnote "nothing to compile"
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 08065c6..f691799 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -280,7 +280,7 @@  base_do_configure() {
 addtask compile after do_configure
 do_compile[dirs] = "${S} ${B}"
 base_do_compile() {
-	if [ -e Makefile -o -e makefile ]; then
+	if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
 		oe_runmake || die "make failed"
 	else
 		bbnote "nothing to compile"