Patchwork acpid: modify CFLAGS

login
register
mail settings
Submitter Joe Slater
Date Feb. 14, 2013, 5:09 p.m.
Message ID <1360861770-30010-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/44653/
State Accepted
Commit f81b8fc920f619130624d5f98a86aa58419371a5
Headers show

Comments

Joe Slater - Feb. 14, 2013, 5:09 p.m.
Override the hard-coded CFLAGS used in Makefile
to reference our CFLAGS.

Upstream-Status:  Pending

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-bsp/acpid/acpid.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Saul Wold - Feb. 14, 2013, 8:24 p.m.
On 02/14/2013 09:09 AM, Joe Slater wrote:
> Override the hard-coded CFLAGS used in Makefile
> to reference our CFLAGS.
>

Can you be clearer about this?

I just checked the output of the compile log and these flags are set 
correctly. I also looked at the make -n output via a devshell.

This seems to be hardcoding the CFLAGS into this recipe.

Sounds like something else is going on.

Thanks
	Sau!


> Upstream-Status:  Pending
>
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>   meta/recipes-bsp/acpid/acpid.inc |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
> index 3c0219f..1ffe6ff 100644
> --- a/meta/recipes-bsp/acpid/acpid.inc
> +++ b/meta/recipes-bsp/acpid/acpid.inc
> @@ -13,7 +13,9 @@ inherit update-rc.d
>   INITSCRIPT_NAME = "acpid"
>   INITSCRIPT_PARAMS = "defaults"
>
> -EXTRA_OEMAKE = ""
> +# Makefile ignores our CFLAGS, so override it.
> +#
> +EXTRA_OEMAKE = "CFLAGS='-W -Wall -Werror -Wundef -Wshadow ${CFLAGS} $(DEFS)'"
>
>   do_compile () {
>   	oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}'
>
Slater, Joseph - Feb. 15, 2013, 7:16 p.m.
Thanks for looking at this so quickly.

If I set the optimization to DEBUG_OPTIMIZATION, I see -O0
in CFLAGS, but I see -O2 in log.do_compile.  In Makefile, itself,
I see

CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE -O2 -g $(DEFS)

and rather than patch that, I thought it would be easier to just override it.

I am using the acpid recipe from openembedded-core master branch.

Joe

Patch

diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 3c0219f..1ffe6ff 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -13,7 +13,9 @@  inherit update-rc.d
 INITSCRIPT_NAME = "acpid"
 INITSCRIPT_PARAMS = "defaults"
 
-EXTRA_OEMAKE = ""
+# Makefile ignores our CFLAGS, so override it.
+#
+EXTRA_OEMAKE = "CFLAGS='-W -Wall -Werror -Wundef -Wshadow ${CFLAGS} $(DEFS)'"
 
 do_compile () {
 	oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}'