jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-06 09:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rrdtool: 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

 - 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 23:18:42 +02:00
parent e7af4033c3
commit 4fa80a811d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/rrdtool/Config.in
View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_RRDTOOL
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2 depends on BR2_USE_MMU # libglib2
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
help help
RRDtool is the OpenSource industry standard, high performance RRDtool is the OpenSource industry standard, high performance
data logging and graphing system for time series data. data logging and graphing system for time series data.

6
package/rrdtool/rrdtool.mk
View File

@ -8,7 +8,7 @@ RRDTOOL_VERSION = 1.6.0
RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT
RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE
RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
# autoreconf needed to avoid link failure due to missing -lintl, # autoreconf needed to avoid link failure due to missing -lintl,
# gettextize needed as a consequence of autoreconf # gettextize needed as a consequence of autoreconf
RRDTOOL_AUTORECONF = YES RRDTOOL_AUTORECONF = YES
@ -25,10 +25,6 @@ RRDTOOL_CONF_OPTS = \
--disable-ruby \ --disable-ruby \
--disable-tcl --disable-tcl
ifeq ($(BR2_NEEDS_GETTEXT),y)
RRDTOOL_DEPENDENCIES += gettext
endif
ifeq ($(BR2_PACKAGE_RRDTOOL_RRDGRAPH),y) ifeq ($(BR2_PACKAGE_RRDTOOL_RRDGRAPH),y)
RRDTOOL_DEPENDENCIES += cairo pango RRDTOOL_DEPENDENCIES += cairo pango
else else