zile 2.6.x was rewritten in Vala and now needs glib-2.0, libgee and the Vala toolchain, plus autoconf-archive (AX_REQUIRE_DEFINED) for autoreconf. Add the dependencies, inherit vala, build in-tree (the Vala build writes generated sources back into the tree) with CLEANBROKEN, and drop the obsolete --enable-acl PACKAGECONFIG (removed upstream).
Signed-off-by: Khem Raj <[email protected]> --- meta-oe/recipes-support/zile/zile_2.4.15.bb | 24 ------------- meta-oe/recipes-support/zile/zile_2.6.4.bb | 38 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 meta-oe/recipes-support/zile/zile_2.4.15.bb create mode 100644 meta-oe/recipes-support/zile/zile_2.6.4.bb diff --git a/meta-oe/recipes-support/zile/zile_2.4.15.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb deleted file mode 100644 index d7973ab861..0000000000 --- a/meta-oe/recipes-support/zile/zile_2.4.15.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Zile is lossy Emacs" -HOMEPAGE = "http://zile.sourceforge.net/"; -DEPENDS = "ncurses bdwgc" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ - file://remove-help2man.patch \ -" - -SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" - -inherit autotools pkgconfig - -do_install:append() { - rm -rf ${D}${libdir}/charset.alias - rmdir --ignore-fail-on-non-empty ${D}${libdir} || true -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" - -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," diff --git a/meta-oe/recipes-support/zile/zile_2.6.4.bb b/meta-oe/recipes-support/zile/zile_2.6.4.bb new file mode 100644 index 0000000000..eb677d1019 --- /dev/null +++ b/meta-oe/recipes-support/zile/zile_2.6.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "Zile is lossy Emacs" +HOMEPAGE = "http://zile.sourceforge.net/"; +DEPENDS = "ncurses bdwgc glib-2.0 libgee autoconf-archive-native" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ + file://remove-help2man.patch \ +" + +SRC_URI[sha256sum] = "d5d44b85cb490643d0707e1a2186f3a32998c2f6eabaa9481479b65caeee57c0" + +inherit autotools pkgconfig vala + +# zile's Vala build writes generated sources (e.g. src/dummy.vala) back into the +# source tree, so build in-tree. The shipped maintainer GNUmakefile aborts on +# "make clean" before configure, so skip the preconfigure clean. +B = "${S}" +CLEANBROKEN = "1" + +# zile ships a pre-generated aclocal.m4 with the pkg-config macros but does not +# carry pkg.m4 in its m4/ macro dir. With newer autoconf/automake, autoreconf +# regenerates aclocal.m4 and can no longer find PKG_CHECK_EXISTS, failing with +# "undefined or overquoted macro: PKG_CHECK_EXISTS". Stage pkg.m4 from the +# native pkg-config so aclocal picks it up (m4/ is on its -I search path). +do_configure:prepend() { + install -d ${S}/m4 + install -m 0644 ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 ${S}/m4/ +} + +do_install:append() { + rm -rf ${D}${libdir}/charset.alias + rmdir --ignore-fail-on-non-empty ${D}${libdir} || true +} + +# zile 2.6.x dropped the --enable-acl/--disable-acl configure switches +# (file attribute handling moved to GLib/GIO), so no acl PACKAGECONFIG.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127876): https://lists.openembedded.org/g/openembedded-devel/message/127876 Mute This Topic: https://lists.openembedded.org/mt/120013673/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
