Skip to contentSkip to conversation

package/brltty: fix build with expat

PATCH New Fabrice Fontaine 3 participants 5 messages Oct 13, 2019 – Oct 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/brltty: fix build with expat

tbl2hex is a host command line that is built with:

$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(EXPAT_LIBS_FOR_BUILD) $(LDLIBS_FOR_BUILD)

It needs cldr.o which can depends on expat and is built through:

%.$B: $(SRC_DIR)/%.c

       $(CC_FOR_BUILD) -DFOR_BUILD $(CFLAGS_FOR_BUILD) -o $@ -c $<

When cross-compiling, build fails because expat is not found on host:

gcc -DFOR_BUILD -I. -I. -I./../Programs -I../Programs -I../Headers -I./.. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -DHAVE_CONFIG_H -g -O2 -std=gnu99 -Wall -Werror=format-security -o cldr.build.o -c cldr.c cldr.c:31:10: fatal error: expat.h: No such file or directory

 #include <expat.h>
          ^~~~~~~~~

To fix this issue, add host-expat dependency as well as patch to add $(EXPAT_INCLUDES_FOR_BUILD) and set CC_FOR_BUILD, LD_FOR_BUILD, EXPAT_INCLUDES_FOR_BUILD and LDFLAGS_FOR_BUILD in brltty.mk CFLAGS_FOR_BUILD can't be overriden as it's used to set internal paths such as Headers

Fixes:
- http://autobuild.buildroot.org/results/362cfb57e4a91a066493269d8078d931529ddf69

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Really fix the issue by adding a patch and setting xxx_FOR_BUILD variables

 ...ix-cross-build-of-tbl2hex-with-expat.patch | 50 +++++++++++++++++++
 package/brltty/brltty.mk                      | 12 ++++-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 package/brltty/0002-common.mk-fix-cross-build-of-tbl2hex-with-expat.patch
package/brltty/0002-common.mk-fix-cross-build-of-tbl2hex-with-expat.patch new file +50 -0
new file mode 100644
index 0000000000..f598d1dcdd
@@ -0,0 +1,50 @@
+From 93b4cec3652e82313fc093f3050cec56243ed60b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 13 Oct 2019 10:32:42 +0200
+Subject: [PATCH] common.mk: fix cross-build of tbl2hex with expat
+
+tbl2hex is a host command line that is built with:
+
+$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(EXPAT_LIBS_FOR_BUILD) $(LDLIBS_FOR_BUILD)
+
+It needs cldr.o which can depends on expat and is built through:
+
+%.$B: $(SRC_DIR)/%.c
+       $(CC_FOR_BUILD) -DFOR_BUILD $(CFLAGS_FOR_BUILD) -o $@ -c $<
+
+When cross-compiling, build fails because expat is not found on host:
+
+gcc -DFOR_BUILD -I. -I. -I./../Programs -I../Programs -I../Headers -I./.. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE  -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -DHAVE_CONFIG_H -g -O2 -std=gnu99 -Wall -Werror=format-security -o cldr.build.o -c cldr.c
+cldr.c:31:10: fatal error: expat.h: No such file or directory
+ #include <expat.h>
+          ^~~~~~~~~
+
+To fix this issue, add $(EXPAT_INCLUDES_FOR_BUILD) to allow the user to
+give the path of his host expat package.
+CFLAGS_FOR_BUILD can't be overriden by the user as brltty uses it to set
+his own internal paths
+
+Fixes:
+ - http://autobuild.buildroot.org/results/362cfb57e4a91a066493269d8078d931529ddf69
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ common.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common.mk b/common.mk
+index e0721d178..1484680d5 100644
+--- a/common.mk
++++ b/common.mk
+@@ -27,7 +27,7 @@ include $(SRC_TOP)absdeps.mk
+ include $(SRC_DIR)/reldeps.mk
+ 
+ %.$B: $(SRC_DIR)/%.c
+-	$(CC_FOR_BUILD) -DFOR_BUILD $(CFLAGS_FOR_BUILD) -o $@ -c $<
++	$(CC_FOR_BUILD) -DFOR_BUILD $(EXPAT_INCLUDES_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $<
+ 
+ API_NAME = brlapi
+ API_ARC = $(ARC_PFX)$(API_NAME).$(ARC_EXT)
+-- 
+2.23.0
+
package/brltty/brltty.mk +11 -1
index b9d608b9f5..c8a109747a 100644
@@ -27,6 +27,14 @@ BRLTTY_CONF_OPTS = \
 	--without-mikropuhe --without-speechd --without-swift \
 	--without-theta
 
+# Our package uses autoconf, but not automake, so we need to pass
+# those variables@compile time as well.
+# CFLAGS_FOR_BUILD can't be passed as it's used to set internal paths
+BRLTTY_MAKE_OPTS = \
+	CC_FOR_BUILD="$(HOSTCC)" \
+	LD_FOR_BUILD="$(HOSTLD)" \
+	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
+
 # Autoreconf is needed because we're patching configure.ac in
 # 0001-Fix-linking-error-on-mips64el. However, a plain autoreconf doesn't work,
 # because this package is only autoconf-based.
@@ -51,8 +59,10 @@ BRLTTY_CONF_OPTS += --without-espeak
 endif
 
 ifeq ($(BR2_PACKAGE_EXPAT),y)
-BRLTTY_DEPENDENCIES += expat
+# host-expat is needed by tbl2hex's host program
+BRLTTY_DEPENDENCIES += host-expat expat
 BRLTTY_CONF_OPTS += --enable-expat
+BRLTTY_MAKE_OPTS += EXPAT_INCLUDES_FOR_BUILD="$(HOST_CFLAGS)"
 else
 BRLTTY_CONF_OPTS += --disable-expat
 endif
Signature · 1 line
2.23.0
#1 lore raw

PATCH v2 1/1 package/brltty: fix build with expat

Hello,

+Yann, since there is some shell script sorcery involved below.

Quoted 22 lines · On Sun, 13 Oct 2019 14:45:50 +0200 Fabrice Fontaine…

tbl2hex is a host command line that is built with:

$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(EXPAT_LIBS_FOR_BUILD) $(LDLIBS_FOR_BUILD)

It needs cldr.o which can depends on expat and is built through:

%.$B: $(SRC_DIR)/%.c

       $(CC_FOR_BUILD) -DFOR_BUILD $(CFLAGS_FOR_BUILD) -o $@ -c $<

When cross-compiling, build fails because expat is not found on host:

gcc -DFOR_BUILD -I. -I. -I./../Programs -I../Programs -I../Headers -I./.. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -DHAVE_CONFIG_H -g -O2 -std=gnu99 -Wall -Werror=format-security -o cldr.build.o -c cldr.c cldr.c:31:10: fatal error: expat.h: No such file or directory

 #include <expat.h>
          ^~~~~~~~~

To fix this issue, add host-expat dependency as well as patch to add $(EXPAT_INCLUDES_FOR_BUILD) and set CC_FOR_BUILD, LD_FOR_BUILD, EXPAT_INCLUDES_FOR_BUILD and LDFLAGS_FOR_BUILD in brltty.mk CFLAGS_FOR_BUILD can't be overriden as it's used to set internal paths such as Headers

Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/362cfb57e4a91a066493269d8078d931529ddf69

I am sorry, but this is still not good, and is still too much of a hack. I had a look at the brltty build system. Basically, the ./configure script that we call for the target will internally call another ./configure but for the host, after setting CC, CFLAGS, LDFLAGS, CXX and al. to their _FOR_BUILD counterparts.

This is done in the mk4build script:

   for variable in CC CFLAGS CXX CXXFLAGS LDFLAGS LDLIBS
   do
      unset "${variable}"
      variableForBuild="${variable}_FOR_BUILD"
      eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"'
   done

   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \
      --disable-iconv \
      --disable-icu \

The issue is that for some reason the magic "eval" stuff doesn't do its job. Indeed, if I change the ${sourceRoot}/configure invocation to:

   CC=${CC_FOR_BUILD} \
   CFLAGS=${CFLAGS_FOR_BUILD} \
   CXX=${CXX_FOR_BUILD} \
   CXXFLAGS=${CXXFLAGS_FOR_BUILD} \
   LDFLAGS=${LDFLAGS_FOR_BUILD} \
   LDLIBS=${LDLIBS_FOR_BUILD} \
   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \

Then magically all the _FOR_BUILD variables are properly taken into account (you can check the forbuild.log file, which is the equivalent of config.log, but for running this internal ./configure invocation for the host).

So, if we fix this, then magically the _FOR_BUILD variables that we already pass to the ./configure invocation in autotools-package are properly taken into account, all the way to the forbuild.mk file, which will fix the expat build, without needing this hack of EXPAT_INCLUDES_FOR_BUILD and passing again the _FOR_BUILD variables in MAKE_OPTS.

Perhaps Yann can shed some light as to why the magic eval stuff doesn't behave like it should.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/brltty: fix build with expat

Thomas, All,

On 2019-10-16 23:14 +0200, Thomas Petazzoni spake thusly:

Quoted 1 line

+Yann, since there is some shell script sorcery involved below.

Eh... ;-)

Quoted 2 lines

On Sun, 13 Oct 2019 14:45:50 +0200
Fabrice Fontaine <[email protected]> wrote:

[--SNIP--]

Quoted 30 lines
Quoted 5 lines

To fix this issue, add host-expat dependency as well as patch to add $(EXPAT_INCLUDES_FOR_BUILD) and set CC_FOR_BUILD, LD_FOR_BUILD, EXPAT_INCLUDES_FOR_BUILD and LDFLAGS_FOR_BUILD in brltty.mk CFLAGS_FOR_BUILD can't be overriden as it's used to set internal paths such as Headers

I am sorry, but this is still not good, and is still too much of a hack. I had a look at the brltty build system. Basically, the ./configure script that we call for the target will internally call another ./configure but for the host, after setting CC, CFLAGS, LDFLAGS, CXX and al. to their _FOR_BUILD counterparts.

This is done in the mk4build script:

   for variable in CC CFLAGS CXX CXXFLAGS LDFLAGS LDLIBS
   do
      unset "${variable}"
      variableForBuild="${variable}_FOR_BUILD"
      eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"'
   done

   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \
      --disable-iconv \
      --disable-icu \

The issue is that for some reason the magic "eval" stuff doesn't do its job. Indeed, if I change the ${sourceRoot}/configure invocation to:

Quoted 9 lines
   CC=${CC_FOR_BUILD} \
   CFLAGS=${CFLAGS_FOR_BUILD} \
   CXX=${CXX_FOR_BUILD} \
   CXXFLAGS=${CXXFLAGS_FOR_BUILD} \
   LDFLAGS=${LDFLAGS_FOR_BUILD} \
   LDLIBS=${LDLIBS_FOR_BUILD} \
   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \

[--SNIP--]

Quoted 2 lines

Perhaps Yann can shed some light as to why the magic eval stuff doesn't behave like it should.

The difference I can spot is that in the first case, the 'unset' will cause the variables to be unset *and* unexported. Then the variables are (maybe) properly set by the eval, but they are not exported, and so are just not in the environment, and thus the sub-configure does not get them.

In the second case, the variables are implicitly exported in the environment of the sub-configure.

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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 1/1 package/brltty: fix build with expat

Quoted 26 lines · On Thu, 17 Oct 2019 20:22:13 +0200 "Yann E. MORIN" <[email protected]>…
Quoted 16 lines
   for variable in CC CFLAGS CXX CXXFLAGS LDFLAGS LDLIBS
   do
      unset "${variable}"
      variableForBuild="${variable}_FOR_BUILD"
      eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"'
   done

   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \
      --disable-iconv \
      --disable-icu \

The issue is that for some reason the magic "eval" stuff doesn't do its job. Indeed, if I change the ${sourceRoot}/configure invocation to:

Quoted 9 lines
   CC=${CC_FOR_BUILD} \
   CFLAGS=${CFLAGS_FOR_BUILD} \
   CXX=${CXX_FOR_BUILD} \
   CXXFLAGS=${CXXFLAGS_FOR_BUILD} \
   LDFLAGS=${LDFLAGS_FOR_BUILD} \
   LDLIBS=${LDLIBS_FOR_BUILD} \
   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \  

[--SNIP--]

Quoted 8 lines
Quoted 2 lines

Perhaps Yann can shed some light as to why the magic eval stuff doesn't behave like it should.

The difference I can spot is that in the first case, the 'unset' will cause the variables to be unset *and* unexported. Then the variables are (maybe) properly set by the eval, but they are not exported, and so are just not in the environment, and thus the sub-configure does not get them.

Ah, so:

	eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"'

should be changed to:

	eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval export "${variable}"'="${'"${variableForBuild}"'}"'

?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v2 1/1 package/brltty: fix build with expat

In reply to Thomas Petazzoni

Hello Fabrice,

Quoted 12 lines · On Wed, 16 Oct 2019 23:14:48 +0200 Thomas Petazzoni…

The issue is that for some reason the magic "eval" stuff doesn't do its job. Indeed, if I change the ${sourceRoot}/configure invocation to:

   CC=${CC_FOR_BUILD} \
   CFLAGS=${CFLAGS_FOR_BUILD} \
   CXX=${CXX_FOR_BUILD} \
   CXXFLAGS=${CXXFLAGS_FOR_BUILD} \
   LDFLAGS=${LDFLAGS_FOR_BUILD} \
   LDLIBS=${LDLIBS_FOR_BUILD} \
   "${sourceRoot}/configure" \
      --disable-api \
      --disable-gpm \

Since there was no news from you on this issue, I went ahead and created a patch for brltty that does this, which I submitted upstream. I then re-used that in your Buildroot patch, and applied;

https://git.buildroot.org/buildroot/commit/?id=899ab0d63ca88979d97309027a3916f5a6fac1a0

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com