jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

libuio: use the new gettext logic

Browse Source 
This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:53:04 +02:00
parent c9d8d754f3
commit 24c6a63367
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/libuio/Config.in
View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBUIO config BR2_PACKAGE_LIBUIO
bool "libuio" bool "libuio"
select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL 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 help
libuio is a light-weight C programming library to handle UIO libuio is a light-weight C programming library to handle UIO
(Userspace I/O) device discovery and binding task. (Userspace I/O) device discovery and binding task.

9
package/libuio/libuio.mk
View File

@ -10,6 +10,8 @@ LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs) LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs)
LIBUIO_LICENSE_FILES = COPYING LIBUIO_LICENSE_FILES = COPYING
LIBUIO_CONF_OPTS = --with-glib=no --without-werror LIBUIO_CONF_OPTS = --with-glib=no --without-werror
LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
LIBUIO_LIBS = $(TARGET_NLS_LIBS)
LIBUIO_INSTALL_STAGING = YES LIBUIO_INSTALL_STAGING = YES
# Fetched from github, no pre-generated configure script provided # Fetched from github, no pre-generated configure script provided
@ -24,13 +26,6 @@ LIBUIO_DEPENDENCIES += argp-standalone
LIBUIO_LIBS += -largp LIBUIO_LIBS += -largp
endif 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)" LIBUIO_CONF_ENV += LIBS="$(LIBUIO_LIBS)"
$(eval $(autotools-package)) $(eval $(autotools-package))