diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-10-19 15:06:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-04 13:31:27 +0000 |
commit | 0dabbf6307bfef5927d7a92b31f3eac1d698972a (patch) | |
tree | d651f095e0009e64900d9bb582146603fc91b293 /meta/recipes-support/libical/libical_3.0.6.bb | |
parent | 1b577bcc44cbf7a9e94f8770f21841a16ad50c64 (diff) | |
download | openembedded-core-0dabbf6307bfef5927d7a92b31f3eac1d698972a.tar.gz |
libical: add PACKAGECONFIG glib and enable it by default
* As long as there is no solution upstream [1] build src-generator native and
adjust cmake file to find it
* libical-glib is a mandatory dependency for evolution-data-server >= 3.34
[1] https://github.com/libical/libical/issues/394
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/libical/libical_3.0.6.bb')
-rw-r--r-- | meta/recipes-support/libical/libical_3.0.6.bb | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/meta/recipes-support/libical/libical_3.0.6.bb b/meta/recipes-support/libical/libical_3.0.6.bb index 032f3655e9..f9be898a12 100644 --- a/meta/recipes-support/libical/libical_3.0.6.bb +++ b/meta/recipes-support/libical/libical_3.0.6.bb @@ -7,27 +7,35 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ file://LICENSE.MPL2.txt;md5=9741c346eef56131163e13b9db1241b3" SECTION = "libs" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz" - +SRC_URI = " \ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-Use-our-hand-build-native-src-generator.patch \ +" SRC_URI[md5sum] = "463a59244c6767b8e67b29379405e297" SRC_URI[sha256sum] = "5c8a21c2b732ece4a33e5c862970b4f35a8548bbcda50de5695f6fc211ac4d97" UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig -PACKAGECONFIG ??= "icu" +do_compile_prepend() { + # As long as https://github.com/libical/libical/issues/394 is open build native src-generator manually + NATIVE_CFLAGS="${BUILD_CFLAGS} `pkg-config-native --cflags glib-2.0` `pkg-config-native --cflags libxml-2.0`" + NATIVE_LDFLAGS="${BUILD_LDFLAGS} `pkg-config-native --libs glib-2.0` `pkg-config-native --libs libxml-2.0`" + ${BUILD_CC} $NATIVE_CFLAGS ${S}/src/libical-glib/tools/generator.c ${S}/src/libical-glib/tools/xml-parser.c -o ${B}/src-generator $NATIVE_LDFLAGS +} + +PACKAGECONFIG ??= "icu glib" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" +PACKAGECONFIG[glib] = "-DICAL_GLIB=True,-DICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" # ICU is used for RSCALE (RFC7529) support PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" # No need to use perl-native, the host perl is sufficient. EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" +# doc build fails with linker error (??) for libical-glib so disable it +EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" -# The glib library can't be cross-compiled, disable for now. -# https://github.com/libical/libical/issues/394 -EXTRA_OECMAKE += "-DICAL_GLIB=false" - -do_install_append_class-target () { +do_install_append () { # Remove build host references sed -i \ -e 's,${STAGING_LIBDIR},${libdir},g' \ |