All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/vdr-plugin-vnsiserver: don't install i18n files when not needed
@ 2019-10-26  7:46 Thomas Petazzoni
  2019-10-31  8:13 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Petazzoni @ 2019-10-26  7:46 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=d9ed9b6d5925aa44185addccc15064d5af2af190
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

This used to cause a build failure with gettext-tiny, but this is now
fixed by the version bump in 160f0a033ba4edf2f7efe5fed82426acd3b34b70
("package/gettext-tiny: bump version"). Nevertheless, it makes sense
to not install the i18n files when they are not needed, i.e when
BR2_SYSTEM_ENABLE_NLS is disabled.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
index eeab0c879b..9b49736d04 100644
--- a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
+++ b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
@@ -12,6 +12,11 @@ VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr
 
 VDR_PLUGIN_VNSISERVER_CXXFLAGS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC"
 
+VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS = install-lib
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS += install-i18n
+endif
+
 define VDR_PLUGIN_VNSISERVER_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
 		$(VDR_PLUGIN_VNSISERVER_CXXFLAGS)
@@ -19,8 +24,8 @@ endef
 
 define VDR_PLUGIN_VNSISERVER_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr \
-		LOCDIR=/usr/share/locale
+		$(VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) \
+		LIBDIR=/usr/lib/vdr LOCDIR=/usr/share/locale
 endef
 
 $(eval $(generic-package))

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [git commit] package/vdr-plugin-vnsiserver: don't install i18n files when not needed
  2019-10-26  7:46 [Buildroot] [git commit] package/vdr-plugin-vnsiserver: don't install i18n files when not needed Thomas Petazzoni
@ 2019-10-31  8:13 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2019-10-31  8:13 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=d9ed9b6d5925aa44185addccc15064d5af2af190
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > This used to cause a build failure with gettext-tiny, but this is now
 > fixed by the version bump in 160f0a033ba4edf2f7efe5fed82426acd3b34b70
 > ("package/gettext-tiny: bump version"). Nevertheless, it makes sense
 > to not install the i18n files when they are not needed, i.e when
 > BR2_SYSTEM_ENABLE_NLS is disabled.

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > Reviewed-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2019.08.x, thanks (2019.02.x does not have gettext-tiny).

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-10-31  8:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-26  7:46 [Buildroot] [git commit] package/vdr-plugin-vnsiserver: don't install i18n files when not needed Thomas Petazzoni
2019-10-31  8:13 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.