From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../zile/files/remove-help2man.patch | 28 ++++++++++++++++++++++ .../meta-oe/recipes-support/zile/zile_2.4.14.bb | 25 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb (limited to 'meta-openembedded/meta-oe/recipes-support/zile') diff --git a/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch new file mode 100644 index 0000000000..c1a63f4797 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch @@ -0,0 +1,28 @@ +Upstream-Status: Inappropriate [configuration] + +diff --git a/Makefile.am b/Makefile.am +index 54bc59f..46c2650 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -36,7 +36,6 @@ PERL_BUILDTIME = \ + + EXTRA_DIST = \ + FAQ \ +- build-aux/zile-help2man-wrapper \ + $(PERL_BUILDTIME) + + doc_DATA = AUTHORS FAQ NEWS +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 639f59c..8c5123e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -33,9 +33,3 @@ doc/zile.1: $(srcdir)/doc/zile.1.in doc/Makefile.am config.status + $(edit) $(abs_srcdir)/doc/zile.1.in >$@.tmp + mv $@.tmp $@ + +-$(srcdir)/doc/zile.1.in: doc/man-extras build-aux/zile-help2man-wrapper configure.ac $(builddir)/src/zile$(EXEEXT) +- @test -d doc || mkdir doc +-## Exit gracefully if zile.1.in is not writeable, such as during distcheck! +- $(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \ +- $(srcdir)/build-aux/missing --run $(HELP2MAN) --output=$@ --no-info --name="Zile Is Lossy Emacs" --include $(srcdir)/doc/man-extras $(srcdir)/build-aux/zile-help2man-wrapper; \ +- fi diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb new file mode 100644 index 0000000000..515cf41365 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb @@ -0,0 +1,25 @@ +SUMMARY = "Zile is lossy Emacs" +HOMEPAGE = "http://zile.sourceforge.net/" +DEPENDS = "ncurses bdwgc" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "http://ftp.gnu.org/gnu/zile/${BP}.tar.gz \ + file://remove-help2man.patch \ +" + +SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73" +SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74" + +inherit autotools pkgconfig + +do_install_append() { + rm -rf ${D}${libdir}/charset.alias + rmdir --ignore-fail-on-non-empty ${D}${libdir} || true +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" + +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -- cgit v1.2.3