Skip to contentSkip to conversation

libuio: remove gettext dependency

PATCH New Thomas De Schampheleire 2 participants 3 messages Feb 3, 2017 – Feb 4, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libuio: remove gettext dependency

From: Thomas De Schampheleire <[email protected]>

The gettext dependency of libuio is only needed for internationalization of messages in the lsuio program. Since the real purpose for libuio is the library, the impact of gettext on build time is considered too large for the benefit for those users that want to use lsuio.

Patch libuio to disable internationalization.
Previous statements related to gettext, makeinfo, ... are now no longer needed.

---
 .../0001-configure-remove-po-Makefile.in.patch     | 26 -----------
 .../libuio/0001-remove-gettext-dependency.patch    | 51 ++++++++++++++++++++++
 package/libuio/Config.in                           |  1 -
 package/libuio/libuio.mk                           | 17 +++-----
 4 files changed, 58 insertions(+), 37 deletions(-)
 delete mode 100644 package/libuio/0001-configure-remove-po-Makefile.in.patch
 create mode 100644 package/libuio/0001-remove-gettext-dependency.patch
package/libuio/0001-configure-remove-po-Makefile.in.patch deleted +0 -26
deleted file mode 100644
index 067465c..0000000
@@ -1,26 +0,0 @@
-From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-Date: Fri, 1 Jul 2016 17:56:30 +0200
-Subject: [PATCH] configure: remove po/Makefile.in
-
-The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize
-
-Signed-off-by: Romain Naour <[email protected]>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f7fb40f..a25e463 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,5 +55,4 @@ dnl last but not least
- AC_OUTPUT([Makefile
- 	libuio.dox
- 	libuio-uninstalled.pc
--	libuio.pc
--	po/Makefile.in])
-+	libuio.pc])
--- 
-2.5.5
-
package/libuio/0001-remove-gettext-dependency.patch new file +51 -0

51 lines not on this page · raw message

package/libuio/Config.in +0 -1
index a96df54..97be1e3 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBUIO
 	bool "libuio"
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  libuio is a light-weight C programming library to handle UIO
 	  (Userspace I/O) device discovery and binding task.
package/libuio/libuio.mk +7 -10
index 6d07f1f..aaea256 100644
@@ -11,26 +11,23 @@ LIBUIO_LICENSE = LGPLv2.1 (library), GPLv2 (programs)
 LIBUIO_LICENSE_FILES = COPYING
 LIBUIO_CONF_OPTS = --with-glib=no --without-werror
 LIBUIO_INSTALL_STAGING = YES
+LIBUIO_DEPENDENCIES = host-pkgconf
 
 # Fetched from github, no pre-generated configure script provided
-LIBUIO_GETTEXTIZE = YES
 LIBUIO_AUTORECONF = YES
 
-# Avoid build issue when makeinfo is missing
-LIBUIO_CONF_ENV += MAKEINFO=true
+# Requirements for autoreconf, see autogen.sh
+define LIBUIO_PREPARE_AUTORECONF
+       mkdir -p $(@D)/m4
+       touch $(@D)/ChangeLog
+endef
+LIBUIO_POST_EXTRACT_HOOKS += LIBUIO_PREPARE_AUTORECONF
 
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 LIBUIO_DEPENDENCIES += argp-standalone
 LIBUIO_LIBS += -largp
 endif
 
-# libuio pulls in libintl if needed, so ensure we also
-# link against it, otherwise static linking fails
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LIBUIO_DEPENDENCIES += gettext
-LIBUIO_LIBS += -lintl
-endif
-
 LIBUIO_CONF_ENV += LIBS="$(LIBUIO_LIBS)"
 
 $(eval $(autotools-package))
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/1 libuio: remove gettext dependency

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

From: Thomas De Schampheleire <[email protected]> The gettext dependency of libuio is only needed for internationalization of messages in the lsuio program. Since the real purpose for libuio is the library, the impact of gettext on build time is considered too large for the benefit for those users that want to use lsuio.

Patch libuio to disable internationalization.
Previous statements related to gettext, makeinfo, ... are now no longer needed.

Hmm, we don't like to maintain non-upstreamable patches like this. Have you discussed this with upstream? Perhaps they would be OK with something like a --disable-tools configure flag?

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

PATCH 1/1 libuio: remove gettext dependency

Quoted 8 lines · Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

From: Thomas De Schampheleire <[email protected]> The gettext dependency of libuio is only needed for internationalization of messages in the lsuio program. Since the real purpose for libuio is the library, the impact of gettext on build time is considered too large for the benefit for those users that want to use lsuio.

Quoted 7 lines
Quoted 3 lines

Patch libuio to disable internationalization.
Previous statements related to gettext, makeinfo, ... are now no longer needed.

Hmm, we don't like to maintain non-upstreamable patches like this. Have you discussed this with upstream? Perhaps they would be OK with something like a --disable-tools configure flag?

Ok, I opened an issue here to discuss it:
https://github.com/Linutronix/libuio/issues/7
I'm not sure how interested they still are in changes to libuio, as the last change is from 2015.
We'll see what they say...

Thanks,
Thomas