summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Khouri <marc@khouri.ca>2016-08-10 10:30:16 -0400
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-08-11 00:02:31 +0200
commitbf53191d9ef3620fe493f3b4a96458ad1a8f5ed1 (patch)
tree4f186109d4e11df54e0caa567ab4a664ebdc9d16
parent9ed1eda5dbe2130cd938d7a3c1a8a30aa26fa9db (diff)
downloadbuildroot-bf53191d9ef3620fe493f3b4a96458ad1a8f5ed1.tar.gz
buildroot-bf53191d9ef3620fe493f3b4a96458ad1a8f5ed1.zip
libical: use system time zone info
libical requires time zone information in order to make use of time zone functions (otherwise, segfaults occur when applications call the time zone functions). This patch: 1. forces the system to build time zone info 2. ensures libical does not build its own time zone info (this is the default behaviour, but the flag is added in case libical's default changes in the future). Signed-off-by: Marc Khouri <marc@khouri.ca> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libical/Config.in1
-rw-r--r--package/libical/libical.mk2
2 files changed, 3 insertions, 0 deletions
diff --git a/package/libical/Config.in b/package/libical/Config.in
index 48170e9f87..3220d5bee1 100644
--- a/package/libical/Config.in
+++ b/package/libical/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBICAL
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR
+ select BR2_TARGET_TZ_INFO
help
libical is an Open Source (MPL/LGPL) implementation of the IETF's
iCalendar Calendaring and Scheduling protocols.
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index e8cb3f8d79..a511039569 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -13,5 +13,7 @@ LIBICAL_LICENSE_FILES = LICENSE
# building without this option is broken, it is used by
# Gentoo/alpinelinux as well
LIBICAL_CONF_OPTS = -DSHARED_ONLY=true
+# never build time zone info, always use system's tzinfo
+LIBICAL_CONF_OPTS += -DUSE_BUILTIN_TZDATA=false
$(eval $(cmake-package))
OpenPOWER on IntegriCloud