package/gettext: Fix GETTEXTIZE is not defined in case of full gettext
PATCH v3 1/1 package/gettext: Fix GETTEXTIZE is not defined in case of full gettext
After introducing gettext-tiny in:
5367a1b253 package/gettext-tiny: new package
GETTEXTIZE variable is conditionally defined separately by gettext-gnu or gettext-tiny package depending on which of them is enabled. But it causes the issue when BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y, because in that case BR2_PACKAGE_GETTEXT is not selected by BR2_SYSTEM_ENABLE_NLS config and GETTEXTIZE is not defined, which causes build fail for packages which uses gettextizing (e.g. host-flex).
Fix issue by defining GETTEXTIZE unconditionally in package/gettext/gettext.mk. It is not needed to define it in each gettext-*.mk because the difference is only in passing 'data_dir' parameter which points to ${PREFIX}/share/gettext-tiny (in case of gettext-tiny provider), but simple linking:
${PREFIX}/share/gettext -> ${PREFIX}/share/gettext-tinysolves this issue.
---
v3:
Make commit message more descriptive and cleaner, also fix 'data_dir' explanation which was not updated in v2.
v2:
Do not use ${PREFIX}/share/gettext-tiny as 'data_dir' param for
gettextize, but instead create link ${PREFIX}/share/gettext -> ${PREFIX}/share/gettext-tiny.
It allows to have common invovation of gettextize in package/gettext.mkpackage/gettext-gnu/gettext-gnu.mk | 4 ---- package/gettext-tiny/gettext-tiny.mk | 10 +++------- package/gettext/gettext.mk | 2 ++ 3 files changed, 5 insertions(+), 11 deletions(-)
package/gettext-gnu/gettext-gnu.mk +0 -4
@@ -95,9 +95,5 @@ endef HOST_GETTEXT_GNU_POST_INSTALL_HOOKS += HOST_GETTEXT_GNU_ADD_ABOUT_NLS -ifeq ($(BR2_PACKAGE_GETTEXT_GNU),y) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/gettext-tiny/gettext-tiny.mk +3 -7
@@ -98,6 +98,9 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0644 -D $(@D)/extra/Makevars.template $(HOST_DIR)/share/gettext-tiny/po/Makevars.template $(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS + + # for gettextize + ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext endef # Install simple echo wrapper for gettext tool
@@ -105,12 +108,5 @@ define GETTEXT_TINY_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(GETTEXT_TINY_PKGDIR)/gettext-wrapper $(TARGET_DIR)/usr/bin/gettext endef -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) \ - AUTOM4TE=$(HOST_DIR)/bin/autom4te \ - gettext_datadir=$(HOST_DIR)/usr/share/gettext-tiny \ - $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(generic-package)) $(eval $(host-generic-package))
package/gettext/gettext.mk +2 -0
@@ -4,5 +4,7 @@ # ################################################################################ +GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f + $(eval $(virtual-package)) $(eval $(host-virtual-package))
Signature · 1 line
2.14.1
PATCH v3 1/1 package/gettext: Fix GETTEXTIZE is not defined in case of full gettext
Hi Vadim,
Le 08/04/2019 ? 22:31, Vadim Kochan a ?crit?:
Quoted 17 lines
After introducing gettext-tiny in:
5367a1b253package/gettext-tiny: new packageGETTEXTIZE variable is conditionally defined separately by gettext-gnu or gettext-tiny package depending on which of them is enabled. But it causes the issue when BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y, because in that case
BR2_PACKAGE_GETTEXTis not selected byBR2_SYSTEM_ENABLE_NLSconfig and GETTEXTIZE is not defined, which causes build fail for packages which uses gettextizing (e.g. host-flex).Fix issue by defining GETTEXTIZE unconditionally in
package/gettext/gettext.mk. It is not needed to define it in each gettext-*.mk because the difference is only in passing 'data_dir' parameter which points to ${PREFIX}/share/gettext-tiny (in case of gettext-tiny provider), but simple linking:
Quoted 6 lines
${PREFIX}/share/gettext -> ${PREFIX}/share/gettext-tinysolves this issue.
Reported-by Romain Naour <[email protected]>Signed-off-by Vadim Kochan <[email protected]>
Best regards,
Romain
Quoted 69 lines
---
v3:
Make commit message more descriptive and cleaner, also fix 'data_dir' explanation which was not updated in v2.v2:
Do not use ${PREFIX}/share/gettext-tiny as 'data_dir' param for gettextize, but instead create link ${PREFIX}/share/gettext -> ${PREFIX}/share/gettext-tiny. It allows to have common invovation of gettextize in package/gettext.mkpackage/gettext-gnu/gettext-gnu.mk | 4 ---- package/gettext-tiny/gettext-tiny.mk | 10 +++------- package/gettext/gettext.mk | 2 ++ 3 files changed, 5 insertions(+), 11 deletions(-)package/gettext-gnu/gettext-gnu.mk +0
-4@@ -95,9 +95,5 @@ endef HOST_GETTEXT_GNU_POST_INSTALL_HOOKS += HOST_GETTEXT_GNU_ADD_ABOUT_NLS -ifeq ($(BR2_PACKAGE_GETTEXT_GNU),y) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))package/gettext-tiny/gettext-tiny.mk +3
-7@@ -98,6 +98,9 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0644 -D $(@D)/extra/Makevars.template $(HOST_DIR)/share/gettext-tiny/po/Makevars.template $(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS + + # for gettextize + ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext endef # Install simple echo wrapper for gettext tool@@ -105,12 +108,5 @@ define GETTEXT_TINY_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(GETTEXT_TINY_PKGDIR)/gettext-wrapper $(TARGET_DIR)/usr/bin/gettext endef -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) \ - AUTOM4TE=$(HOST_DIR)/bin/autom4te \ - gettext_datadir=$(HOST_DIR)/usr/share/gettext-tiny \ - $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(generic-package)) $(eval $(host-generic-package))package/gettext/gettext.mk +2
-0@@ -4,5 +4,7 @@ # ################################################################################ +GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f + $(eval $(virtual-package)) $(eval $(host-virtual-package))
Thomas Petazzoni
AppliedPATCH v3 1/1 package/gettext: Fix GETTEXTIZE is not defined in case of full gettext
In reply to Vadim KochanHello Vadim,
Quoted 19 lines · On Mon, 8 Apr 2019 23:31:32 +0300 Vadim Kochan <[email protected]> wrote:
After introducing gettext-tiny in:
5367a1b253package/gettext-tiny: new packageGETTEXTIZE variable is conditionally defined separately by gettext-gnu or gettext-tiny package depending on which of them is enabled. But it causes the issue when BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y, because in that case
BR2_PACKAGE_GETTEXTis not selected byBR2_SYSTEM_ENABLE_NLSconfig and GETTEXTIZE is not defined, which causes build fail for packages which uses gettextizing (e.g. host-flex).Fix issue by defining GETTEXTIZE unconditionally in
package/gettext/gettext.mk. It is not needed to define it in each gettext-*.mk because the difference is only in passing 'data_dir' parameter which points to ${PREFIX}/share/gettext-tiny (in case of gettext-tiny provider), but simple linking:${PREFIX}/share/gettext -> ${PREFIX}/share/gettext-tiny
Quoted 8 lines
solves this issue.
Reported-by Romain Naour <[email protected]>Signed-off-by Vadim Kochan <[email protected]>---
v3:
Make commit message more descriptive and cleaner, also fix 'data_dir' explanation which was not updated in v2.
Applied to master after reworking the commit log. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com