Skip to contentSkip to conversation

package/kodi: fix build in minimal config (branch yem/fixes)

PATCH New Yann E. MORIN 3 participants 8 messages Nov 14, 2019 – Nov 19, 2019

lore
Share & tools
lore
#0 lore raw

cover package/kodi: fix build in minimal config (branch yem/fixes)

Hello All!

With a minimal configuration, Kodi fails to build because of a missing autopoint, so this series adds the missing dependency to host-gettext.

In the way, it also brings two fixes to gettext-tiny.

Failing defconfig:

    BR2_arm=y
    BR2_cortex_a7=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_INIT_NONE=y
    BR2_SYSTEM_BIN_SH_NONE=y
    # BR2_PACKAGE_BUSYBOX is not set
    BR2_PACKAGE_KODI=y
    BR2_PACKAGE_RPI_USERLAND=y
    BR2_PACKAGE_PYTHON=y
    BR2_PACKAGE_PYTHON_PY_ONLY=y
    # BR2_TARGET_ROOTFS_TAR is not set

Error message:
[ 2%] Performing autoreconf step for 'libcpluff'
autoreconf: Entering directory `.'
autoreconf: running: autopoint --force
Can't exec "autopoint": No such file or directory at [...]/host/share/autoconf/Auto4te/FileUtils.pm line 345.
autoreconf: failed to run autopoint: No such file or directory
autoreconf: autopoint is needed because this package uses Gettext
make[4]: *** [CMakeFiles/libcpluff.dir/build.make:121: build/cpluff/src/libcpluff-stamp/libcpluff-autoreconf] Error 1 make[3]: *** [CMakeFiles/Makefile2:615: CMakeFiles/libcpluff.dir/all] Error 2

Regards,
Yann E. MORIN.

The following changes since commit 6d588b718de3cc17aee95462fd356933c6470006

package/kodi: drop readline dependency (2019-11-14 18:37:10 +0100)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 9a12e61152e7f9944e986aa9f1c7483750e767c2

package/kodi: add missing host-gettext dependency (2019-11-14 20:09:21 +0100)

----------------------------------------------------------------
Yann E. MORIN (3):
package/gettext-tiny: fix prefix in autopoint package/gettext-tiny: fix gettext wrapper package/kodi: add missing host-gettext dependency

 package/gettext-tiny/gettext-tiny.mk | 1 +
 package/gettext-tiny/gettext-wrapper | 2 +-
 package/kodi/kodi.mk                 | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
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.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/3 package/gettext-tiny: fix prefix in autopoint

gettext-tiny also installs a fake autopoint, but it still needs to be pointed at the m4 macros, which the template autopoint expects to be in @datadir@, where datadir is the traditional autotools datadir, derived from datarootdir, itself derived from prefix.

So, pass prefix so all the locations are properly pointing to HOST_DIR, instead of the default /usr/local.

Cc Vadim Kochan <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
 package/gettext-tiny/gettext-tiny.mk | 1 +
 1 file changed, 1 insertion(+)
package/gettext-tiny/gettext-tiny.mk +1 -0
index 23a9d9a057..6ee6269e09 100644
@@ -52,6 +52,7 @@ HOST_GETTEXT_TINY_POST_PATCH_HOOKS += HOST_GETTEXT_TINY_COPY_EXTRA_FILES
 define HOST_GETTEXT_TINY_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
 		$(HOST_CONFIGURE_OPTS) \
+		prefix=$(HOST_DIR) \
 		CFLAGS="$(HOST_CFLAGS) -fPIC" \
 		LIBINTL=NONE
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/3 package/gettext-tiny: fix prefix in autopoint

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

gettext-tiny also installs a fake autopoint, but it still needs to be pointed at the m4 macros, which the template autopoint expects to be in @datadir@, where datadir is the traditional autotools datadir, derived from datarootdir, itself derived from prefix.

Quoted 6 lines

So, pass prefix so all the locations are properly pointing to HOST_DIR, instead of the default /usr/local.

Cc Vadim Kochan <[email protected]>
Cc Thomas Petazzoni <[email protected]>

Committed to 2019.08.x (not in 2019.02.x), thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/3 package/gettext-tiny: fix gettext wrapper

In reply to Yann E. MORIN

When a textdomain is specified, we ignore it twice: we shift args, and we printf ${2}, which would yield an empty printf.

Fix that by not shifting, and just printf ${2}; this is nicer.

Cc Vadim Kochan <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
 package/gettext-tiny/gettext-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gettext-tiny/gettext-wrapper +1 -1
index 3791a3a1aa..11424824c3 100644
@@ -19,6 +19,6 @@ done
 case ${#} in
     (0)   printf "missing arguments\n" >&2; return 1;;
     (1)   printf "%s" "${1}";;
-    (2)   shift; printf "%s" "${2}";;
+    (2)   printf "%s" "${2}";;
     (*)   printf "too many arguments\n" >&2; return 1;;
 esac
Signature · 1 line
2.20.1
#4 lore raw

PATCH 2/3 package/gettext-tiny: fix gettext wrapper

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

When a textdomain is specified, we ignore it twice: we shift args, and we printf ${2}, which would yield an empty printf.

Fix that by not shifting, and just printf ${2}; this is nicer.

Cc Vadim Kochan <[email protected]>
Cc Thomas Petazzoni <[email protected]>

Committed to 2019.08.x (not in 2019.02.x), thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/3 package/kodi: add missing host-gettext dependency

In reply to Yann E. MORIN

A sub-component of Kodi (cpluff) needs to be autoreconf-ed, and uses gettext, so calls to autopoint.

Add a dependency to host-gettext to bring an appropriate variant that provides autotpoint (gettext-tiny's autopoint works like a charm, for the curious).

Cc Bernd Kuhls <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
---
 package/kodi/kodi.mk | 1 +
 1 file changed, 1 insertion(+)
package/kodi/kodi.mk +1 -0
index 49728e464b..ceab5d5c0b 100644
@@ -19,6 +19,7 @@ KODI_DEPENDENCIES = \
 	freetype \
 	gnutls \
 	host-gawk \
+	host-gettext \
 	host-gperf \
 	host-kodi-jsonschemabuilder \
 	host-kodi-texturepacker \
Signature · 1 line
2.20.1
#6 lore raw

PATCH 3/3 package/kodi: add missing host-gettext dependency

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

A sub-component of Kodi (cpluff) needs to be autoreconf-ed, and uses gettext, so calls to autopoint.

Quoted 7 lines

Add a dependency to host-gettext to bring an appropriate variant that provides autotpoint (gettext-tiny's autopoint works like a charm, for the curious).

Cc Bernd Kuhls <[email protected]>
Cc Maxime Hadjinlian <[email protected]>

Committed to 2019.02.x and 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

cover package/kodi: fix build in minimal config (branch yem/fixes)

In reply to Yann E. MORIN
Quoted 4 lines · On Thu, 14 Nov 2019 20:22:07 +0100 "Yann E. MORIN" <[email protected]>…

Yann E. MORIN (3):
package/gettext-tiny: fix prefix in autopoint package/gettext-tiny: fix gettext wrapper package/kodi: add missing host-gettext dependency

Thanks, series applied to master. However, I've extended a bit the commit log of PATCH 3/3 with some details from your cover letter (the error log).

Thanks!

Thomas

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