[Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS
@ 2020-06-06 12:28 Fabrice Fontaine
  2020-06-06 12:28 ` [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5 Fabrice Fontaine
  2020-06-06 19:41 ` [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Peter Seiderer
  0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-06-06 12:28 UTC (permalink / raw)
  To: buildroot

Do not use CXX to save the "$(TARGET_CXX) $(TARGET_CXXFLAGS)
$(TARGET_LDFLAGS)" tuple and instead use TARGET_CONFIGURE_OPTS to pass
variables using the "standard" variables

LDFLAGS is supported since
https://git.linuxtv.org/edid-decode.git/commit/?id=0a454bcbba5e172c64236811ed98c161689372f1

CFLAGS is supported since
https://git.linuxtv.org/edid-decode.git/commit/?id=b202b675e38578b33494fc45c2869917e66ba22d

edid-decode did not switch CFLAGS to CXXFLAGS in
https://git.linuxtv.org/edid-decode.git/commit/Makefile?id=e00579c128ced87a69df29a01caaaf0cd4a4c8cc
so use CFLAGS to pass TARGET_CXXFLAGS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Peter Seiderer):
 - Drop link on autobuilder failure

 package/edid-decode/edid-decode.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk
index 8fe1e2712a..c41a9f2a76 100644
--- a/package/edid-decode/edid-decode.mk
+++ b/package/edid-decode/edid-decode.mk
@@ -10,12 +10,13 @@ EDID_DECODE_LICENSE = MIT
 EDID_DECODE_LICENSE_FILES = LICENSE
 
 define EDID_DECODE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		CXX="$(TARGET_CXX) $(TARGET_CXXFLAGS) $(TARGET_LDFLAGS)"
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		CFLAGS="$(TARGET_CXXFLAGS)"
 endef
 
 define EDID_DECODE_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" install
 endef
 
 $(eval $(generic-package))
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5
  2020-06-06 12:28 [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Fabrice Fontaine
@ 2020-06-06 12:28 ` Fabrice Fontaine
  2020-06-06 19:44   ` Peter Seiderer
  2020-06-06 19:41 ` [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Peter Seiderer
  1 sibling, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2020-06-06 12:28 UTC (permalink / raw)
  To: buildroot

Pass -std=c++11 to fix the following build failure with gcc <= 5:

/tmp/instance-0/output-1/host/bin/mips64el-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os       -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g -DSHA="not available" -o edid-decode edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp parse-displayid-block.cpp parse-ls-ext-block.cpp parse-di-ext-block.cpp parse-vtb-ext-block.cpp -lm
edid-decode.cpp: In member function 'std::__cxx11::string edid_state::dtd_type()':
edid-decode.cpp:192:17: error: 'to_string' is not a member of 'std'
  unsigned len = std::to_string(preparse_total_dtds).length();
                 ^

Also add a dependency on gcc 4.7

Fixes:
 - http://autobuild.buildroot.org/results/71e4a50542c4551797f1d0404d27244612b427d7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Peter Seiderer):
 - Add dependency on gcc 4.7

 package/edid-decode/Config.in      | 6 ++++--
 package/edid-decode/edid-decode.mk | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in
index d2d21288de..ddf1942c68 100644
--- a/package/edid-decode/Config.in
+++ b/package/edid-decode/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_EDID_DECODE
 	bool "edid-decode"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	help
 	  Decode EDID data in human-readable format.
 
 	  https://git.linuxtv.org/edid-decode.git/
 
-comment "edid-decode needs a toolchain w/ C++"
-	depends on !!BR2_INSTALL_LIBSTDCPP
+comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7"
+	depends on !!BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk
index c41a9f2a76..7e463c02b1 100644
--- a/package/edid-decode/edid-decode.mk
+++ b/package/edid-decode/edid-decode.mk
@@ -11,7 +11,7 @@ EDID_DECODE_LICENSE_FILES = LICENSE
 
 define EDID_DECODE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		CFLAGS="$(TARGET_CXXFLAGS)"
+		CFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endef
 
 define EDID_DECODE_INSTALL_TARGET_CMDS
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS
  2020-06-06 12:28 [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Fabrice Fontaine
  2020-06-06 12:28 ` [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5 Fabrice Fontaine
@ 2020-06-06 19:41 ` Peter Seiderer
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Seiderer @ 2020-06-06 19:41 UTC (permalink / raw)
  To: buildroot

Hello Fabrice,

On Sat,  6 Jun 2020 14:28:09 +0200, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Do not use CXX to save the "$(TARGET_CXX) $(TARGET_CXXFLAGS)
> $(TARGET_LDFLAGS)" tuple and instead use TARGET_CONFIGURE_OPTS to pass
> variables using the "standard" variables
>
> LDFLAGS is supported since
> https://git.linuxtv.org/edid-decode.git/commit/?id=0a454bcbba5e172c64236811ed98c161689372f1
>
> CFLAGS is supported since
> https://git.linuxtv.org/edid-decode.git/commit/?id=b202b675e38578b33494fc45c2869917e66ba22d
>
> edid-decode did not switch CFLAGS to CXXFLAGS in
> https://git.linuxtv.org/edid-decode.git/commit/Makefile?id=e00579c128ced87a69df29a01caaaf0cd4a4c8cc
> so use CFLAGS to pass TARGET_CXXFLAGS
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Peter Seiderer):
>  - Drop link on autobuilder failure
>
>  package/edid-decode/edid-decode.mk | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk
> index 8fe1e2712a..c41a9f2a76 100644
> --- a/package/edid-decode/edid-decode.mk
> +++ b/package/edid-decode/edid-decode.mk
> @@ -10,12 +10,13 @@ EDID_DECODE_LICENSE = MIT
>  EDID_DECODE_LICENSE_FILES = LICENSE
>
>  define EDID_DECODE_BUILD_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
> -		CXX="$(TARGET_CXX) $(TARGET_CXXFLAGS) $(TARGET_LDFLAGS)"
> +	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
> +		CFLAGS="$(TARGET_CXXFLAGS)"
>  endef
>
>  define EDID_DECODE_INSTALL_TARGET_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
> +	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
> +		DESTDIR="$(TARGET_DIR)" install

No need for the 'TARGET_CONFIGURE_OPTS' here (as the install only uses DESTDIR)...

With this fixed and because the same effective compile options are used
as without the patch you can add my:

Tested-by: Peter Seiderer <ps.report@gmx.net>

Regards,
Peter

>  endef
>
>  $(eval $(generic-package))

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5
  2020-06-06 12:28 ` [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5 Fabrice Fontaine
@ 2020-06-06 19:44   ` Peter Seiderer
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Seiderer @ 2020-06-06 19:44 UTC (permalink / raw)
  To: buildroot

Hello Fabrice,

On Sat,  6 Jun 2020 14:28:10 +0200, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Pass -std=c++11 to fix the following build failure with gcc <= 5:
>
> /tmp/instance-0/output-1/host/bin/mips64el-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os       -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g -DSHA="not available" -o edid-decode edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp parse-displayid-block.cpp parse-ls-ext-block.cpp parse-di-ext-block.cpp parse-vtb-ext-block.cpp -lm
> edid-decode.cpp: In member function 'std::__cxx11::string edid_state::dtd_type()':
> edid-decode.cpp:192:17: error: 'to_string' is not a member of 'std'
>   unsigned len = std::to_string(preparse_total_dtds).length();
>                  ^
>
> Also add a dependency on gcc 4.7
>
> Fixes:
>  - http://autobuild.buildroot.org/results/71e4a50542c4551797f1d0404d27244612b427d7
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Peter Seiderer):
>  - Add dependency on gcc 4.7
>
>  package/edid-decode/Config.in      | 6 ++++--
>  package/edid-decode/edid-decode.mk | 2 +-
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in
> index d2d21288de..ddf1942c68 100644
> --- a/package/edid-decode/Config.in
> +++ b/package/edid-decode/Config.in
> @@ -1,10 +1,12 @@
>  config BR2_PACKAGE_EDID_DECODE
>  	bool "edid-decode"
>  	depends on BR2_INSTALL_LIBSTDCPP
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
>  	help
>  	  Decode EDID data in human-readable format.
>
>  	  https://git.linuxtv.org/edid-decode.git/
>
> -comment "edid-decode needs a toolchain w/ C++"
> -	depends on !!BR2_INSTALL_LIBSTDCPP
> +comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7"
> +	depends on !!BR2_INSTALL_LIBSTDCPP || \
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
> diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk
> index c41a9f2a76..7e463c02b1 100644
> --- a/package/edid-decode/edid-decode.mk
> +++ b/package/edid-decode/edid-decode.mk
> @@ -11,7 +11,7 @@ EDID_DECODE_LICENSE_FILES = LICENSE
>
>  define EDID_DECODE_BUILD_CMDS
>  	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
> -		CFLAGS="$(TARGET_CXXFLAGS)"
> +		CFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
>  endef
>
>  define EDID_DECODE_INSTALL_TARGET_CMDS

Reviewed-by: Peter Seiderer <ps.report@gmx.net>

Regards,
Peter

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-06-06 19:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-06 12:28 [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Fabrice Fontaine
2020-06-06 12:28 ` [Buildroot] [PATCH v2, 2/2] package/edid-decode: fix build with gcc <= 5 Fabrice Fontaine
2020-06-06 19:44   ` Peter Seiderer
2020-06-06 19:41 ` [Buildroot] [PATCH v2, 1/2] package/edid-decode: use TARGET_CONFIGURE_OPTS Peter Seiderer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.