summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-12-15 21:03:16 +0900
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-12-19 12:39:04 +0000
commitdbb40a3c7b0f0df1afe1d94d6306100f9ad087f2 (patch)
tree70fccbdaf5c012581ab271c35362e4eeb7aa6bd7
parent2531bbc7b80e5d6ddb954c9755da50292337cae5 (diff)
downloaddefinitions-dbb40a3c7b0f0df1afe1d94d6306100f9ad087f2.tar.gz
Upgrading libical to version 1.0.1
Note also we changed the source repo to the new libical-git and updated to use the new cmake-only build. libical 1.0.1 is required to build gnome-calendar Change-Id: I8e431e00bf1e77d0ed00f493de12b4928e30befd
-rw-r--r--strata/audio-bluetooth.morph6
-rw-r--r--strata/audio-bluetooth/libical.morph5
2 files changed, 5 insertions, 6 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 6561a81f..01283d03 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -24,9 +24,9 @@ chunks:
- alsa-lib
- name: libical
morph: strata/audio-bluetooth/libical.morph
- repo: upstream:libical
- ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
- unpetrify-ref: baserock/morph
+ repo: upstream:libical-git
+ ref: da69aae790f680b633100475cac14c776fbda722
+ unpetrify-ref: v1.0.1
- name: bluez
morph: strata/audio-bluetooth/bluez.morph
repo: upstream:bluez
diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph
index 1f772fd9..2ee7c96c 100644
--- a/strata/audio-bluetooth/libical.morph
+++ b/strata/audio-bluetooth/libical.morph
@@ -1,6 +1,5 @@
name: libical
kind: chunk
-build-system: autotools
+build-system: cmake
configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
+- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib