diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-05-02 11:15:04 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-13 12:12:27 +0200 |
| commit | 3ac4bf634e16cc8b5f1f8d732da296b4e32dd734 (patch) | |
| tree | 3a527efa3744c963aebd6f29a5f57b62ea4b6ba6 /package/libical | |
| parent | b40509c7d80d6610b3f54e6da0dc1265bf6e9e22 (diff) | |
| download | buildroot-3ac4bf634e16cc8b5f1f8d732da296b4e32dd734.tar.gz buildroot-3ac4bf634e16cc8b5f1f8d732da296b4e32dd734.zip | |
package/libical: bump version to v1.0.1 and switch to cmake
Project moved to github according to http://sourceforge.net/projects/freeassociation
"As of 2014-06-14, this project may now be found at http://github.com/libical."
[Thomas: propagate the C++ dependency to bluez5_utils OBEX support,
which selects libical.]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libical')
| -rw-r--r-- | package/libical/0001-no-tests.patch | 19 | ||||
| -rw-r--r-- | package/libical/Config.in | 9 | ||||
| -rw-r--r-- | package/libical/libical.hash | 2 | ||||
| -rw-r--r-- | package/libical/libical.mk | 10 |
4 files changed, 33 insertions, 7 deletions
diff --git a/package/libical/0001-no-tests.patch b/package/libical/0001-no-tests.patch new file mode 100644 index 0000000000..324c04f643 --- /dev/null +++ b/package/libical/0001-no-tests.patch @@ -0,0 +1,19 @@ +Disable tests to avoid MMU dependency due to fork. + +Fixes +CMakeFiles/regression.dir/regression.c.o: In function `_test_file_locks': +/home/br/br4/output/build/libical-v1.0.1/src/test/regression.c:(.text+0x96d8): undefined reference to `_fork' + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> + +diff -uNr libical-1.0.1.org/src/CMakeLists.txt libical-1.0.1/src/CMakeLists.txt +--- libical-1.0.1.org/src/CMakeLists.txt 2014-10-09 17:07:05.000000000 +0200 ++++ libical-1.0.1/src/CMakeLists.txt 2015-04-25 17:41:22.657345548 +0200 +@@ -1,7 +1,6 @@ + add_subdirectory(libical) + add_subdirectory(libicalss) + add_subdirectory(libicalvcal) +-add_subdirectory(test) + + if(MSVC) + install(FILES diff --git a/package/libical/Config.in b/package/libical/Config.in index 9bb63c3d0b..48170e9f87 100644 --- a/package/libical/Config.in +++ b/package/libical/Config.in @@ -1,11 +1,14 @@ config BR2_PACKAGE_LIBICAL bool "libical" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR help libical is an Open Source (MPL/LGPL) implementation of the IETF's iCalendar Calendaring and Scheduling protocols. - http://www.citadel.org/doku.php/documentation:featured_projects:libical + http://libical.github.io/libical -comment "libical needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +comment "libical needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS diff --git a/package/libical/libical.hash b/package/libical/libical.hash index 2382ad7654..5c42cdcc61 100644 --- a/package/libical/libical.hash +++ b/package/libical/libical.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0 libical-0.48.tar.gz +sha256 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 libical-1.0.1.tar.gz diff --git a/package/libical/libical.mk b/package/libical/libical.mk index 4025627b17..e8cb3f8d79 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -4,10 +4,14 @@ # ################################################################################ -LIBICAL_VERSION = 0.48 -LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION) +LIBICAL_VERSION = 1.0.1 +LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION) LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPLv1.0 or LGPLv2.1 LIBICAL_LICENSE_FILES = LICENSE -$(eval $(autotools-package)) +# building without this option is broken, it is used by +# Gentoo/alpinelinux as well +LIBICAL_CONF_OPTS = -DSHARED_ONLY=true + +$(eval $(cmake-package)) |
