Skip to contentSkip to conversation

package/edid-decode: use TARGET_CONFIGURE_OPTS

PATCH Superseded Fabrice Fontaine 3 participants 6 messages Jun 6, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/edid-decode: use TARGET_CONFIGURE_OPTS

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

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

---
 package/edid-decode/edid-decode.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/edid-decode/edid-decode.mk +4 -3
index 8fe1e2712a..c41a9f2a76 100644
@@ -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))
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 package/edid-decode: fix build with gcc <= 5

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();
                 ^

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

---
 package/edid-decode/edid-decode.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/edid-decode/edid-decode.mk +1 -1
index c41a9f2a76..7e463c02b1 100644
@@ -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
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/2 package/edid-decode: fix build with gcc <= 5

Hello Fabrice,

Quoted 21 lines · Fabrice Fontaine

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();
                 ^

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

---
 package/edid-decode/edid-decode.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/edid-decode/edid-decode.mk +0 -0
index c41a9f2a76..7e463c02b1 100644

package/edid-decode/edid-decode.mk EDID_DECODE_LICENSE_FILES = LICENSE · line 15

Quoted 6 lines
package/edid-decode/edid-decode.mk +1 -1
@@ -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

Thanks for taking care of the build failure, but with c++11 something like 'depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11' (or 4_7/4_8) missing?

Regards,
Peter

Quoted 2 lines
package/edid-decode/edid-decode.mk +0 -0
 define EDID_DECODE_INSTALL_TARGET_CMDS
#3 lore raw

PATCH 2/2 package/edid-decode: fix build with gcc <= 5

Peter, All,

On 2020-06-06 13:56 +0200, Peter Seiderer spake thusly:

Quoted 2 lines · Fabrice Fontaine
Quoted 1 line

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

[--SNIP--]

Quoted 6 lines
Quoted 6 lines
package/edid-decode/edid-decode.mk +0 -0
index c41a9f2a76..7e463c02b1 100644
@@ -11,7 +11,7 @@ EDID_DECODE_LICENSE_FILES = LICENSE
 
Quoted 8 lines

package/edid-decode/edid-decode.mk EDID_DECODE_LICENSE_FILES = LICENSE · line 15

Quoted 5 lines
package/edid-decode/edid-decode.mk +1 -1
 define EDID_DECODE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		CFLAGS="$(TARGET_CXXFLAGS)"
+		CFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endef

Thanks for taking care of the build failure, but with c++11 something like 'depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11' (or 4_7/4_8) missing?

Parts of C++11 already landed as far back as gcc-4.3:
https://gcc.gnu.org/projects/cxx-status.html#cxx11

So, to have full C++11 support, on eeds gcc-4.8 or later, but for some subsets of C++11, older versions may still be suitable.

But the C++98 standard was the default one until gcc-6.1, which switched directly over to C++14 as the default. That's why the C++11 standard has to be explicitly requested.

However, -std=c++11 is only recognised from gcc-4.7 onward; older versions only knew about -std=c++0x. So if this would also work for gcc <= 4.6, we 'd have to use =std=c++0x (which is still recognised up to gcc-9.x).

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 2/2 package/edid-decode: fix build with gcc <= 5

Hello Yann,

Quoted 27 lines · Yann E. MORIN

Peter, All,

On 2020-06-06 13:56 +0200, Peter Seiderer spake thusly:

Quoted 2 lines · Fabrice Fontaine
Quoted 1 line

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

[--SNIP--]

Quoted 6 lines
Quoted 6 lines
package/edid-decode/edid-decode.mk +0 -0
index c41a9f2a76..7e463c02b1 100644
@@ -11,7 +11,7 @@ EDID_DECODE_LICENSE_FILES = LICENSE
 
Quoted 8 lines

package/edid-decode/edid-decode.mk EDID_DECODE_LICENSE_FILES = LICENSE · line 15

Quoted 5 lines
package/edid-decode/edid-decode.mk +1 -1
 define EDID_DECODE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		CFLAGS="$(TARGET_CXXFLAGS)"
+		CFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endef

Thanks for taking care of the build failure, but with c++11 something like 'depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11' (or 4_7/4_8) missing?

Parts of C++11 already landed as far back as gcc-4.3:
https://gcc.gnu.org/projects/cxx-status.html#cxx11

So, to have full C++11 support, on eeds gcc-4.8 or later, but for some subsets of C++11, older versions may still be suitable.

Quoted 8 lines

But the C++98 standard was the default one until gcc-6.1, which switched directly over to C++14 as the default. That's why the C++11 standard has to be explicitly requested.

However, -std=c++11 is only recognised from gcc-4.7 onward; older versions only knew about -std=c++0x. So if this would also work for gcc <= 4.6, we 'd have to use =std=c++0x (which is still recognised up to gcc-9.x).

Thanks for the detailed explanation! So for edid-decode the simplest solution is at-least-4.7 and std=c++11...

Regards,
Peter

Quoted 4 lines

Regards,
Yann E. MORIN.

#5 lore raw

PATCH 1/2 package/edid-decode: use TARGET_CONFIGURE_OPTS

In reply to Fabrice Fontaine

Hello Fabrice,

Quoted 10 lines · Fabrice Fontaine

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

Quoted 7 lines

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

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

Just from code-review (did not yet test your patch), this patch does not change the resulting used compile/link flags and is only in preparation of the next patch? And as a standalone one does not fix the build failure?

Regards,
Peter

Quoted 26 lines
---
 package/edid-decode/edid-decode.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/edid-decode/edid-decode.mk +4 -3
index 8fe1e2712a..c41a9f2a76 100644
@@ -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))