Skip to contentSkip to conversation

package/gobject-introspection/g-ir-scanner: do not set default compiler values

PATCH New aduskett at gmail.com 2 participants 5 messages Mar 20, 2020 – Mar 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gobject-introspection/g-ir-scanner: do not set default compiler values

From: Adam Duskett <[email protected]>

Commit 8b0aeafce2a22913e6a44818227f6a39e3225157 set 7 new variables in g-ir-scanner.in:

export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" CPPFLAGS="${CPPFLAGS:- at TARGET_CPPFLAGS@}" CFLAGS="${CFLAGS:- at TARGET_CFLAGS@}" CXXFLAGS="${CXXFLAGS:- at TARGET_CXXFLAGS@}" LDFLAGS="${LDFLAGS:- at TARGET_LDFLAGS@}"

However, defaulting to CPP, CC, or CXX breaks some packages because they may hard code CC to the system CC.

One such package is libostree which has the line "INTROSPECTION_SCANNER_ENV = CC=gcc" in the Makefile.

Because g-ir-scanner defaults CC to a predefined CC instead of explicitly overwriting it, the CC passed from the makefile is used, and linking errors occur as a result.

Remove the defaults for the following and explicitly set the paths to the proper cross-toolchain binaries:
CPP, CC, CXX

Fixes
http://autobuild.buildroot.org/results/f8a14307e6feff61acd963d6cd2aac289e6d1647

---
 package/gobject-introspection/g-ir-scanner.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/gobject-introspection/g-ir-scanner.in +3 -3
index 22df7be309..6fc495389e 100644
@@ -5,9 +5,9 @@
 # the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.)
 # Export these variables to ensure all build systems can generate .gir and
 # .typelib files properly.
-export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}"
-export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}"
-export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}"
+export CPP="${HOST_DIR}/bin/@BASENAME_TARGET_CPP@"
+export CC="${HOST_DIR}/bin/@BASENAME_TARGET_CC@"
+export CXX="${HOST_DIR}/bin/@BASENAME_TARGET_CXX@"
 export CPPFLAGS="${CPPFLAGS:- at TARGET_CPPFLAGS@}"
 export CFLAGS="${CFLAGS:- at TARGET_CFLAGS@}"
 export CXXFLAGS="${CXXFLAGS:- at TARGET_CXXFLAGS@}"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 package/libostree: add introspection support

From: Adam Duskett <[email protected]>

If gobject-introspection is selected, explicitly set --enable-introspection in the configure options and add a dependency for gobject-introspection.

---
 package/libostree/libostree.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/libostree/libostree.mk +7 -0
index bdbe6b5aba..63e6bbfde3 100644
@@ -30,6 +30,13 @@ else
 LIBOSTREE_CONF_OPTS += --without-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+LIBOSTREE_CONF_OPTS += --enable-introspection
+LIBOSTREE_DEPENDENCIES += gobject-introspection
+else
+LIBOSTREE_CONF_OPTS += --disable-introspection
+endif
+
 # Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
 # and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
 # option yet, use the avahi-daemon and dbus config symbols to check for
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 package/libostree: add introspection support

Adam, All,

On 2020-03-20 15:23 -0700, aduskett at gmail.com spake thusly:

Quoted 6 lines

From: Adam Duskett <[email protected]>

If gobject-introspection is selected, explicitly set --enable-introspection in the configure options and add a dependency for gobject-introspection.

I've sent an alternate proposal that replaces this patch, nad gets away with the previous one too:

    https://patchwork.ozlabs.org/patch/1259614/

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/libostree/libostree.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/libostree/libostree.mk +7 -0
index bdbe6b5aba..63e6bbfde3 100644
@@ -30,6 +30,13 @@ else
 LIBOSTREE_CONF_OPTS += --without-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+LIBOSTREE_CONF_OPTS += --enable-introspection
+LIBOSTREE_DEPENDENCIES += gobject-introspection
+else
+LIBOSTREE_CONF_OPTS += --disable-introspection
+endif
+
 # Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
 # and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
 # option yet, use the avahi-daemon and dbus config symbols to check for
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/2 package/gobject-introspection/g-ir-scanner: do not set default compiler values

In reply to aduskett at gmail.com

Adam, All,

On 2020-03-20 15:23 -0700, aduskett at gmail.com spake thusly:

Quoted 13 lines

From: Adam Duskett <[email protected]>

Commit 8b0aeafce2a22913e6a44818227f6a39e3225157 set 7 new variables in g-ir-scanner.in:

export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" CPPFLAGS="${CPPFLAGS:- at TARGET_CPPFLAGS@}" CFLAGS="${CFLAGS:- at TARGET_CFLAGS@}" CXXFLAGS="${CXXFLAGS:- at TARGET_CXXFLAGS@}" LDFLAGS="${LDFLAGS:- at TARGET_LDFLAGS@}"

Quoted 5 lines

However, defaulting to CPP, CC, or CXX breaks some packages because they may hard code CC to the system CC.

One such package is libostree which has the line "INTROSPECTION_SCANNER_ENV = CC=gcc" in the Makefile.

But then, that's clearly a bug in libostree! They should not ever try to call a hard-coded compiler. If a user would even do a native build with an alternate compiler:

    CC=${HOME}/foo/bin/my-gcc-12.42 ./configure

Then the above would also break anyway. It's not even just about cross-compilation. We should fix libostree and send them the fix. Probably they should do something like:

    INTROSPECTION_SCANNER_ENV = CC=${CC}

With that commit log of yours, the problem is now obvious, while it did not look like it when we discussed on IRC, hence my comments now...

Note that my comments above do not preclude us fixing our wrapper with this patch of yours, but if there is no need to do, I'd like to avoid it.

Regards,
Yann E. MORIN.

Quoted 40 lines

Because g-ir-scanner defaults CC to a predefined CC instead of explicitly overwriting it, the CC passed from the makefile is used, and linking errors occur as a result.

Remove the defaults for the following and explicitly set the paths to the proper cross-toolchain binaries:
CPP, CC, CXX

Fixes
http://autobuild.buildroot.org/results/f8a14307e6feff61acd963d6cd2aac289e6d1647

---
 package/gobject-introspection/g-ir-scanner.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/gobject-introspection/g-ir-scanner.in +3 -3
index 22df7be309..6fc495389e 100644
@@ -5,9 +5,9 @@
 # the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.)
 # Export these variables to ensure all build systems can generate .gir and
 # .typelib files properly.
-export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}"
-export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}"
-export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}"
+export CPP="${HOST_DIR}/bin/@BASENAME_TARGET_CPP@"
+export CC="${HOST_DIR}/bin/@BASENAME_TARGET_CC@"
+export CXX="${HOST_DIR}/bin/@BASENAME_TARGET_CXX@"
 export CPPFLAGS="${CPPFLAGS:- at TARGET_CPPFLAGS@}"
 export CFLAGS="${CFLAGS:- at TARGET_CFLAGS@}"
 export CXXFLAGS="${CXXFLAGS:- at TARGET_CXXFLAGS@}"
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
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 1/2 package/gobject-introspection/g-ir-scanner: do not set default compiler values

Adam, All,

On 2020-03-21 22:47 +0100, Yann E. MORIN spake thusly:

Quoted 13 lines

On 2020-03-20 15:23 -0700, aduskett at gmail.com spake thusly:

Quoted 12 lines

From: Adam Duskett <[email protected]>
Commit 8b0aeafce2a22913e6a44818227f6a39e3225157 set 7 new variables in g-ir-scanner.in:

export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" CPPFLAGS="${CPPFLAGS:- at TARGET_CPPFLAGS@}" CFLAGS="${CFLAGS:- at TARGET_CFLAGS@}" CXXFLAGS="${CXXFLAGS:- at TARGET_CXXFLAGS@}" LDFLAGS="${LDFLAGS:- at TARGET_LDFLAGS@}"

Quoted 8 lines
Quoted 5 lines

However, defaulting to CPP, CC, or CXX breaks some packages because they may hard code CC to the system CC.

One such package is libostree which has the line "INTROSPECTION_SCANNER_ENV = CC=gcc" in the Makefile.

But then, that's clearly a bug in libostree! They should not ever try to call a hard-coded compiler.

[--SNIP--]

Mu alternate proposal was just merged, so I've marked this series as rejected. It anyway helped understand the actual problem, so it was definitely not in vain. Thanks! :-)

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.  |
'------------------------------^-------^------------------^--------------------'