[PATCH] mmc-utils: fix the building failure when DEBUG_BUILD is 1

[PATCH] mmc-utils: fix the building failure when DEBUG_BUILD is 1

[rongqing.li]

From: Roy Li <rongqing.li@windriver.com>

Remove -D_FORTIFY_SOURCE=2 from AM_CFLAGS when DEBUG_BUILD is 1

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index bdb4fed..2b61745 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -13,6 +13,9 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branc
 
 S = "${WORKDIR}/git"
 
+export FORITY="${@base_conditional( "DEBUG_BUILD", "1", "", "-D_FORTIFY_SOURCE=2", d )}"
+EXTRA_OEMAKE = 'AM_CFLAGS="-D_FILE_OFFSET_BITS=64 ${FORITY}"'
+
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 mmc ${D}${bindir}
-- 
1.9.1

Re: [PATCH] mmc-utils: fix the building failure when DEBUG_BUILD is 1

[Rongqing Li]

ping

-R

On 2015年04月23日 11:18, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> Remove -D_FORTIFY_SOURCE=2 from AM_CFLAGS when DEBUG_BUILD is 1
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>   meta/recipes-devtools/mmc/mmc-utils_git.bb | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
> index bdb4fed..2b61745 100644
> --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
> +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
> @@ -13,6 +13,9 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branc
>
>   S = "${WORKDIR}/git"
>
> +export FORITY="${@base_conditional( "DEBUG_BUILD", "1", "", "-D_FORTIFY_SOURCE=2", d )}"
> +EXTRA_OEMAKE = 'AM_CFLAGS="-D_FILE_OFFSET_BITS=64 ${FORITY}"'
> +
>   do_install() {
>       install -d ${D}${bindir}
>       install -m 0755 mmc ${D}${bindir}
>

-- 
Best Reagrds,
Roy | RongQing Li

Re: [PATCH] mmc-utils: fix the building failure when DEBUG_BUILD is 1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

On 23 April 2015 at 04:18, <rongqing.li@windriver.com> wrote:

> +export FORITY="${@base_conditional( "DEBUG_BUILD", "1", "",
> "-D_FORTIFY_SOURCE=2", d )}"
> +EXTRA_OEMAKE = 'AM_CFLAGS="-D_FILE_OFFSET_BITS=64 ${FORITY}"'
>

"FORTIFY" not "FORITY", and why does that need to be exported?

I'm also curious as to why fortify and debug builds are incompatible, and
if there's a sufficient number of problems should we just disable fortify
in security_flags.inc when debug builds are enabled?

Ross

[-- Attachment #2: Type: text/html, Size: 1074 bytes --]

Re: [PATCH] mmc-utils: fix the building failure when DEBUG_BUILD is 1

[Rongqing Li]

On 2015年05月05日 23:43, Burton, Ross wrote:
>
> On 23 April 2015 at 04:18, <rongqing.li@windriver.com
> <mailto:rongqing.li@windriver.com>> wrote:
>
>     +export FORITY="${@base_conditional( "DEBUG_BUILD", "1", "",
>     "-D_FORTIFY_SOURCE=2", d )}"
>     +EXTRA_OEMAKE = 'AM_CFLAGS="-D_FILE_OFFSET_BITS=64 ${FORITY}"'
>
>
> "FORTIFY" not "FORITY", and why does that need to be exported?
>

typos, but it still fix the building failure.


> I'm also curious as to why fortify and debug builds are incompatible,
> and if there's a sufficient number of problems should we just disable
> fortify in security_flags.inc when debug builds are enabled?
>

the mmc-utils always uses the _FORTIFY_SOURCE, so we
need to override AM_CFLAGS to remove FORTIFY.


mmc-utils/git$ grep AM_CFLAGS Makefile
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2
override CFLAGS := $(CHECKFLAGS) $(AM_CFLAGS) $(CFLAGS)
mmc-utils/git$


-Roy

> Ross

-- 
Best Reagrds,
Roy | RongQing Li