Skip to contentSkip to conversation

sysklogd: override SKFLAGS with TARGET_CFLAGS

PATCH New Romain Naour 3 participants 4 messages Feb 20, 2016 – Feb 21, 2016

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/1 sysklogd: override SKFLAGS with TARGET_CFLAGS

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 <[email protected]>
Reported-by Peter Korsgaard <[email protected]>
Cc Peter Korsgaard <[email protected]>
---
 package/sysklogd/sysklogd.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
package/sysklogd/sysklogd.mk +3 -9
index 9e315bc..49997d4 100644
@@ -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
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/1 sysklogd: override SKFLAGS with TARGET_CFLAGS

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> 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.

Quoted 6 lines

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

Signed-off-by Romain Naour <[email protected]>
Reported-by Peter Korsgaard <[email protected]>
Cc Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 2 lines
Venlig hilsen,
Peter Korsgaard
#2 lore raw

PATCH 1/1 sysklogd: override SKFLAGS with TARGET_CFLAGS

In reply to Romain Naour
Quoted 27 lines · 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 <[email protected]>
Reported-by Peter Korsgaard <[email protected]>
Cc Peter Korsgaard <[email protected]>
---
 package/sysklogd/sysklogd.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
package/sysklogd/sysklogd.mk +0 -2
index 9e315bc..49997d4 100644
@@ -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)

package/sysklogd/sysklogd.mk ifeq ($(BR2_PACKAGE_BUSYBOX),y) · line 19

Quoted 10 lines
package/sysklogd/sysklogd.mk +2 -7
-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

Quoted 5 lines
package/sysklogd/sysklogd.mk +1 -0
+		-C $(@D)
 endef
 
 define SYSKLOGD_INSTALL_TARGET_CMDS
Signature · 6 lines
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
#3 lore raw

PATCH 1/1 sysklogd: override SKFLAGS with TARGET_CFLAGS

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Hi,

Quoted 8 lines

package/sysklogd/sysklogd.mk ifeq ($(BR2_PACKAGE_BUSYBOX),y) · line 19

Quoted 4 lines

+# Override SKFLAGS which is used as CFLAGS.
define SYSKLOGD_BUILD_CMDS

package/sysklogd/sysklogd.mk +1 -1
-	$(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:

Quoted 6 lines

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.

Signature · 1 line
Bye, Peter Korsgaard