From 2d9fc8f9472784ebe1b9ead313aa0bd3f3e05c7d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 7 Apr 2016 10:40:23 +0200 Subject: Add system libverto and use in krb5 Otherwise the internal one is used, which has a different soname than the one otherwise used in common distros. --- meta-freedesktop/recipes-core/krb5/krb5_1.13.2.bb | 4 ++-- meta-freedesktop/recipes-core/libverto/libverto_0.2.6.bb | 14 ++++++++++++++ .../recipes-core/tasks/task-freedesktop-contents-sdk.bb | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta-freedesktop/recipes-core/libverto/libverto_0.2.6.bb diff --git a/meta-freedesktop/recipes-core/krb5/krb5_1.13.2.bb b/meta-freedesktop/recipes-core/krb5/krb5_1.13.2.bb index 65013b5..13d1816 100644 --- a/meta-freedesktop/recipes-core/krb5/krb5_1.13.2.bb +++ b/meta-freedesktop/recipes-core/krb5/krb5_1.13.2.bb @@ -15,7 +15,7 @@ HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=f64248328d2d9928e1f04158b5243e7f" -DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native" +DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native libverto" inherit autotools-brokensep binconfig perlnative @@ -45,7 +45,7 @@ PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath" +EXTRA_OECONF += " --without-tcl --with-system-et --with-system-verto --disable-rpath" CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no" diff --git a/meta-freedesktop/recipes-core/libverto/libverto_0.2.6.bb b/meta-freedesktop/recipes-core/libverto/libverto_0.2.6.bb new file mode 100644 index 0000000..e38ac4e --- /dev/null +++ b/meta-freedesktop/recipes-core/libverto/libverto_0.2.6.bb @@ -0,0 +1,14 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bc8917ab981cfa6161dc29319a4038d9" + +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/libverto/libverto-0.2.6.tar.gz/d4e81c21403031089d71eaab07708b89/libverto-0.2.6.tar.gz" +# Original URI, which didn't seem to load for me: https://fedorahosted.org/releases/l/i/libverto/libverto-0.2.6.tar.gz +SRC_URI[md5sum] = "d4e81c21403031089d71eaab07708b89" +SRC_URI[sha256sum] = "17eca6a3855f4884e2e7095e91501767d834b3bf313a6f59a93303f54ac91c9e" + +S = "${WORKDIR}/libverto-0.2.6" + +inherit pkgconfig autotools + +# Don't build glib backend, because we don't want to pull in the yocto glib +EXTRA_OECONF = "--with-pthread --without-glib --without-libev --without-libevent" diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb index d956765..3473864 100644 --- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb +++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb @@ -93,6 +93,7 @@ RDEPENDS_${PN} += " \ db-dev \ icu-dev \ krb5-dev \ + libverto-dev \ acl-dev \ attr-dev \ libcap-bin \ -- cgit v1.2.3