[Buildroot] [PATCH 0/4] fix environment variables passing to configure/make

[Buildroot] [PATCH 0/4] fix environment variables passing to configure/make

[Max Filippov]

Hi,

this series fixes erroneous usage of the 'CFLAGS+="..."' pattern in configure
and make steps, replacing it with 'CFLAGS="$(TARGET_CFLAGS) ..."'.

This fixes one issue reported by autobuilder and makes build commands look
correct in other cases.

Max Filippov (4):
  sqlcipher: fix passing CFLAGS/LDFLAGS to configure
  libcgroup: fix passing CFLAGS/LDFLAGS to configure
  ebtables: fix passing CFLAGS to configure
  sysstat: fix passing CFLAGS to make

 package/ebtables/ebtables.mk   |    4 ++--
 package/libcgroup/libcgroup.mk |    4 ++--
 package/sqlcipher/sqlcipher.mk |    4 ++--
 package/sysstat/sysstat.mk     |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

-- 
1.7.7.6

[Buildroot] [PATCH 1/4] sqlcipher: fix passing CFLAGS/LDFLAGS to configure

[Max Filippov]

SQLCIPHER_CONF_ENV is a string used to pass environment variables to the
confgiure script, '+=' operator doesn't have any special meaning inside
it, so CFLAGS+=... is passed to shell, overwriting previous CFLAGS
value. Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".

Fixes:
  http://autobuild.buildroot.net/results/dbf/dbf947ad6442fa8e57201ffcc96871361bf39ad7/

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 package/sqlcipher/sqlcipher.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 6130870..bae59bb 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -10,8 +10,8 @@ SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 
 SQLCIPHER_CONF_ENV = \
-	CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
-	LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) $(SQLCIPHER_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS) $(SQLCIPHER_LDFLAGS)" \
 	TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
 
 SQLCIPHER_CONF_OPT = \
-- 
1.7.7.6

[Buildroot] [PATCH 1/4] sqlcipher: fix passing CFLAGS/LDFLAGS to configure

[Thomas Petazzoni]

Dear Max Filippov,

On Mon, 12 May 2014 07:27:03 +0400, Max Filippov wrote:
> SQLCIPHER_CONF_ENV is a string used to pass environment variables to the
> confgiure script, '+=' operator doesn't have any special meaning inside
> it, so CFLAGS+=... is passed to shell, overwriting previous CFLAGS
> value. Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".
> 
> Fixes:
>   http://autobuild.buildroot.net/results/dbf/dbf947ad6442fa8e57201ffcc96871361bf39ad7/
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/sqlcipher/sqlcipher.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/4] libcgroup: fix passing CFLAGS/LDFLAGS to configure

[Max Filippov]

LIBCGROUP_CONF_ENV is a string used to pass environment variables to the
confgiure script, '+=' operator doesn't have any special meaning inside
it, so CFLAGS+=... is passed to shell, overwriting previous CFLAGS
value. Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 package/libcgroup/libcgroup.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index 6d7ae54..0ef1e91 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -16,8 +16,8 @@ LIBCGROUP_INSTALL_STAGING = YES
 # large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992
 # for more information.
 LIBCGROUP_CONF_ENV = \
-	CXXFLAGS+="-U_FILE_OFFSET_BITS" \
-	CFLAGS+="-U_FILE_OFFSET_BITS"
+	CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \
+	CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS"
 
 LIBCGROUP_CONF_OPT = \
 	--disable-tools \
-- 
1.7.7.6

[Buildroot] [PATCH 2/4] libcgroup: fix passing CFLAGS/LDFLAGS to configure

[Thomas Petazzoni]

Dear Max Filippov,

On Mon, 12 May 2014 07:27:04 +0400, Max Filippov wrote:
> LIBCGROUP_CONF_ENV is a string used to pass environment variables to the
> confgiure script, '+=' operator doesn't have any special meaning inside
> it, so CFLAGS+=... is passed to shell, overwriting previous CFLAGS
> value. Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/libcgroup/libcgroup.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/4] ebtables: fix passing CFLAGS to configure

[Max Filippov]

EBTABLES_K64U32 is a string passed directly to the configure script,
'+=' operator doesn't have any special meaningi inside it, so
CFLAGS+=-DKERNEL_64_USERSPACE_32 is passed to shell, overwriting previous
CFLAGS value.

Replace CFLAGS+="-DKERNEL_64_USERSPACE_32" with -DKERNEL_64_USERSPACE_32
and pass CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)".

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 package/ebtables/ebtables.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 66a47a2..578c3ae 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -10,11 +10,11 @@ EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtab
 EBTABLES_LICENSE = GPLv2+
 EBTABLES_LICENSE_FILES = COPYING
 EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static)
-EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),CFLAGS+="-DKERNEL_64_USERSPACE_32")
+EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32)
 
 define EBTABLES_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \
-		$(EBTABLES_K64U32) -C $(@D)
+		CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D)
 endef
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-- 
1.7.7.6

[Buildroot] [PATCH 3/4] ebtables: fix passing CFLAGS to configure

[Thomas Petazzoni]

Dear Max Filippov,

On Mon, 12 May 2014 07:27:05 +0400, Max Filippov wrote:
> EBTABLES_K64U32 is a string passed directly to the configure script,
> '+=' operator doesn't have any special meaningi inside it, so
> CFLAGS+=-DKERNEL_64_USERSPACE_32 is passed to shell, overwriting previous
> CFLAGS value.
> 
> Replace CFLAGS+="-DKERNEL_64_USERSPACE_32" with -DKERNEL_64_USERSPACE_32
> and pass CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)".
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/ebtables/ebtables.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/4] sysstat: fix passing CFLAGS to make

[Max Filippov]

SYSSTAT_MAKE_OPT is a string used to pass options to make, '+=' operator
doesn't have any special meaning inside it, so CFLAGS+=... is passed to
shell, overwriting previous CFLAGS value.

Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 package/sysstat/sysstat.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index d3d7519..23486b6 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -14,7 +14,7 @@ SYSSTAT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext
-SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
+SYSSTAT_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -lintl"
 endif
 
 # The isag tool is a post processing script that depends on tcl/tk
-- 
1.7.7.6

[Buildroot] [PATCH 4/4] sysstat: fix passing CFLAGS to make

[Thomas Petazzoni]

Dear Max Filippov,

On Mon, 12 May 2014 07:27:06 +0400, Max Filippov wrote:
> SYSSTAT_MAKE_OPT is a string used to pass options to make, '+=' operator
> doesn't have any special meaning inside it, so CFLAGS+=... is passed to
> shell, overwriting previous CFLAGS value.
> 
> Replace CFLAGS+="..." with CFLAGS="$(TARGET_CFLAGS) ...".
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/sysstat/sysstat.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 0/4] fix environment variables passing to configure/make

[Peter Korsgaard]

>>>>> "Max" == Max Filippov <jcmvbkbc@gmail.com> writes:

 > Hi,
 > this series fixes erroneous usage of the 'CFLAGS+="..."' pattern in configure
 > and make steps, replacing it with 'CFLAGS="$(TARGET_CFLAGS) ..."'.

 > This fixes one issue reported by autobuilder and makes build commands look
 > correct in other cases.

 > Max Filippov (4):
 >   sqlcipher: fix passing CFLAGS/LDFLAGS to configure
 >   libcgroup: fix passing CFLAGS/LDFLAGS to configure
 >   ebtables: fix passing CFLAGS to configure
 >   sysstat: fix passing CFLAGS to make

Committed series, thanks.

-- 
Bye, Peter Korsgaard