From: Joe Slater Date: Mon, 5 Jun 2017 17:53:08 +0000 (-0700) Subject: tcf-agent: correct CFLAGS X-Git-Tag: uninative-1.7~614 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f8e63dff3eb807b07bd71f0e31f6e0cf18ecdb0c;p=openembedded-core.git tcf-agent: correct CFLAGS Modify CFLAGS for several cases which will not compile otherwise. Do not use the form CFLAGS_x_append because it will replace, not append to CFLAGS for override x. Signed-off-by: Joe Slater Signed-off-by: Ross Burton --- diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 1dad825fda..6d6ba76ba8 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -35,17 +35,18 @@ MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -# These features don't compile on mips and libc-musl -CFLAGS_mips_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ - -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ - -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_mips64_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ - -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ - -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_append_libc-musl = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +LCL_STOP_SERVICES = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" + +# These features don't compile for several cases. +# +CFLAGS_append_mips = " ${LCL_STOP_SERVICES}" +CFLAGS_append_mips64 = " ${LCL_STOP_SERVICES}" +CFLAGS_append_libc-musl = " ${LCL_STOP_SERVICES}" +CFLAGS_append_powerpc64 = " ${LCL_STOP_SERVICES}" + do_install() { oe_runmake install INSTALLROOT=${D} install -d ${D}${sysconfdir}/init.d/