[Buildroot] [PATCH] sysklogd: override SKFLAGS with TARGET_CFLAGS

[Buildroot] [PATCH] sysklogd: override SKFLAGS with TARGET_CFLAGS

[Romain Naour]

TARGET_CFLAGS is not taken into account since SKFLAGS is used as CFLAGS.
We need to override SKFLAGS with TARGET_CFLAGS but keep -DSYSV which was
present in SKFLAGS.

Improve the previous fix introduced by
8e3a5c13546451c0c6ceb8bc64e4397ceed14aca.

Fixes:
http://autobuild.buildroot.net/results/2fb/2fb94ecfdc32761a09da35e6fcbdd512847ec911

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Reported-by: Peter Korsgaard <peter@korsgaard.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
---
 package/sysklogd/sysklogd.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 9e315bc..49997d4 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -14,16 +14,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 SYSKLOGD_DEPENDENCIES = busybox
 endif
 
-# CS PowerPC 2012.03 triggers compiler bug.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2),y)
-define SYSKLOGD_WORKAROUND_COMPILER_BUG
-	$(SED) 's/-O3/-O2/' $(@D)/Makefile
-endef
-SYSKLOGD_POST_PATCH_HOOKS = SYSKLOGD_WORKAROUND_COMPILER_BUG
-endif
-
+# Override SKFLAGS which is used as CFLAGS.
 define SYSKLOGD_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \
+		-C $(@D)
 endef
 
 define SYSKLOGD_INSTALL_TARGET_CMDS
-- 
2.5.0

[Buildroot] [PATCH] sysklogd: override SKFLAGS with TARGET_CFLAGS

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > TARGET_CFLAGS is not taken into account since SKFLAGS is used as CFLAGS.
 > We need to override SKFLAGS with TARGET_CFLAGS but keep -DSYSV which was
 > present in SKFLAGS.

 > Improve the previous fix introduced by
 > 8e3a5c13546451c0c6ceb8bc64e4397ceed14aca.

 > Fixes:
 > http://autobuild.buildroot.net/results/2fb/2fb94ecfdc32761a09da35e6fcbdd512847ec911

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > Reported-by: Peter Korsgaard <peter@korsgaard.com>
 > Cc: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [PATCH] sysklogd: override SKFLAGS with TARGET_CFLAGS

[Arnout Vandecappelle]

On 02/20/16 12:28, Romain Naour wrote:
> TARGET_CFLAGS is not taken into account since SKFLAGS is used as CFLAGS.
> We need to override SKFLAGS with TARGET_CFLAGS but keep -DSYSV which was
> present in SKFLAGS.
> 
> Improve the previous fix introduced by
> 8e3a5c13546451c0c6ceb8bc64e4397ceed14aca.
> 
> Fixes:
> http://autobuild.buildroot.net/results/2fb/2fb94ecfdc32761a09da35e6fcbdd512847ec911
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Reported-by: Peter Korsgaard <peter@korsgaard.com>
> Cc: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/sysklogd/sysklogd.mk | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
> index 9e315bc..49997d4 100644
> --- a/package/sysklogd/sysklogd.mk
> +++ b/package/sysklogd/sysklogd.mk
> @@ -14,16 +14,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
>  SYSKLOGD_DEPENDENCIES = busybox
>  endif
>  
> -# CS PowerPC 2012.03 triggers compiler bug.
> -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2),y)
> -define SYSKLOGD_WORKAROUND_COMPILER_BUG
> -	$(SED) 's/-O3/-O2/' $(@D)/Makefile
> -endef
> -SYSKLOGD_POST_PATCH_HOOKS = SYSKLOGD_WORKAROUND_COMPILER_BUG
> -endif
> -
> +# Override SKFLAGS which is used as CFLAGS.
>  define SYSKLOGD_BUILD_CMDS
> -	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> +	$(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \

 Doesn't that make the bug above reappear when you have configured
BR2_OPTIMIZE_3? In other words, shouldn't we do something like:

ifeq ($(BR2_TOOLCHAIN...),y)
SYSKLOGD_CFLAGS = $(subst -O3,-O2,$(TARGET_CFLAGS))
else
SYSKLOGD_CFLAGS = $(TARGET_CFLAGS)
endif
SYSKLOGD_CFLAGS += -DSYSV


 Regards,
 Arnout


> +		-C $(@D)
>  endef
>  
>  define SYSKLOGD_INSTALL_TARGET_CMDS
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH] sysklogd: override SKFLAGS with TARGET_CFLAGS

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

Hi,

 >> +# Override SKFLAGS which is used as CFLAGS.
 >> define SYSKLOGD_BUILD_CMDS
 >> -	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 >> +	$(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \

 >  Doesn't that make the bug above reappear when you have configured
 > BR2_OPTIMIZE_3? In other words, shouldn't we do something like:

 > ifeq ($(BR2_TOOLCHAIN...),y)
 > SYSKLOGD_CFLAGS = $(subst -O3,-O2,$(TARGET_CFLAGS))
 > else
 > SYSKLOGD_CFLAGS = $(TARGET_CFLAGS)
 > endif
 > SYSKLOGD_CFLAGS += -DSYSV

True, but chances are that other packages will be affected by that -O3
issue with the 2012.03, so perhaps the safest option is to make
BR2_OPTIMIZE_3 depend on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2.

-- 
Bye, Peter Korsgaard