diff mbox

[3/3] package/zile: add Zile is Lossy Emacs editor

Message ID 1397225156-23112-4-git-send-email-alex.bennee@linaro.org
State Superseded
Headers show

Commit Message

Alex Bennée April 11, 2014, 2:05 p.m. UTC 
This is a lightweight Emacs clone useful for embedded systems. I nabbed
the help2man disable patch from OpenEmbedded.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2 - review comments
* fixup dependancies
* add s-o-b tag to patch
* fix whitespace

 create mode 100644 package/zile/Config.in
 create mode 100644 package/zile/remove-help2man.patch
 create mode 100644 package/zile/zile.mk

Comments

Alex Bennée April 11, 2014, 3:39 p.m. UTC | #1 
Alex Bennée <alex.bennee@linaro.org> writes:

> This is a lightweight Emacs clone useful for embedded systems. I nabbed
> the help2man disable patch from OpenEmbedded.

I forgot to mention the disable patch was never sent upstream as their
policy is not to submit tweaks to the configure scripts. The alternative
is to submit a patch upstream that enables the disabling of document
generation.
Thomas De Schampheleire April 11, 2014, 8:10 p.m. UTC | #2 
"Alex Bennée" <alex.bennee@linaro.org> schreef:
>This is a lightweight Emacs clone useful for embedded systems. I nabbed
>the help2man disable patch from OpenEmbedded.
>
>Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
>---
>v2 - review comments
>* fixup dependancies
>* add s-o-b tag to patch
>* fix whitespace
>
> create mode 100644 package/zile/Config.in
> create mode 100644 package/zile/remove-help2man.patch
> create mode 100644 package/zile/zile.mk
>
>diff --git a/package/Config.in b/package/Config.in
>index 0e7e246..ad1f4c1 100644
>--- a/package/Config.in
>+++ b/package/Config.in
>@@ -1119,6 +1119,7 @@ source "package/uemacs/Config.in"
> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> source "package/vim/Config.in"
> endif
>+source "package/zile/Config.in"
> endmenu
> 
> endmenu
>diff --git a/package/zile/Config.in b/package/zile/Config.in
>new file mode 100644
>index 0000000..163b44d
>--- /dev/null
>+++ b/package/zile/Config.in
>@@ -0,0 +1,13 @@
>+config BR2_PACKAGE_ZILE
>+	bool "zile"
>+	select BR2_PACKAGE_LIBGC
>+	depends on BR2_USE_MMU # fork()
>+	help
>+	  Zile is Lossy Emacs
>+
>+	  GNU Zile (Zile Is Lossy Emacs) is a lightweight Emacs clone. Every
>+	  Emacs user should feel at home with Zile. Zile is aimed at small
>+	  footprint systems (a typical binary is about 100Kb) and quick editing
>+	  sessions (it starts up and shuts down instantly).
>+
>+	  http://www.gnu.org/software/zile/
>diff --git a/package/zile/remove-help2man.patch b/package/zile/remove-help2man.patch
>new file mode 100644
>index 0000000..d397543
>--- /dev/null
>+++ b/package/zile/remove-help2man.patch

Patches are supposed to be called: pkgname-0001-description.patch


>@@ -0,0 +1,30 @@
>+Upstream-Status: Inappropriate [configuration]
>+
>+Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>+
>+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/package/zile/zile.mk b/package/zile/zile.mk
>new file mode 100644
>index 0000000..b641fe6
>--- /dev/null
>+++ b/package/zile/zile.mk
>@@ -0,0 +1,14 @@
>+################################################################################
>+#
>+# Zile
>+#
>+################################################################################
>+
>+ZILE_VERSION = 2.4.11
>+ZILE_SITE = http://ftp.gnu.org/gnu/zile/
>+ZILE_LICENSE = GPLv1+
>+ZILE_LICENSE_FILES = COPYING
>+ZILE_CONF_OPT += --without-help2man
>+ZILE_DEPENDANCIES += libgc

DEPENDENCIES

Best regards,
Thomas
Thomas Petazzoni April 11, 2014, 10:24 p.m. UTC | #3 
Dear Alex Bennée,

On Fri, 11 Apr 2014 15:05:56 +0100, Alex Bennée wrote:

> diff --git a/package/zile/remove-help2man.patch b/package/zile/remove-help2man.patch
> new file mode 100644
> index 0000000..d397543
> --- /dev/null
> +++ b/package/zile/remove-help2man.patch
> @@ -0,0 +1,30 @@
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> +
> +diff --git a/Makefile.am b/Makefile.am

You're patching Makefile.am here...


> +ZILE_VERSION = 2.4.11
> +ZILE_SITE = http://ftp.gnu.org/gnu/zile/
> +ZILE_LICENSE = GPLv1+
> +ZILE_LICENSE_FILES = COPYING
> +ZILE_CONF_OPT += --without-help2man
> +ZILE_DEPENDANCIES += libgc

but you never mark zile as requiring autoreconf using ZILE_AUTORECONF =
YES. How can this work?

Also, use '=' instead of '+=' above.

And use $(BR2_GNU_MIRROR) for the download URL.

Thanks!

Thomas
Alex Bennée April 17, 2014, 11:44 a.m. UTC | #4 
Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

> "Alex Bennée" <alex.bennee@linaro.org> schreef:
>>This is a lightweight Emacs clone useful for embedded systems. I nabbed
>>the help2man disable patch from OpenEmbedded.
>>
<snip>
>
> Patches are supposed to be called: pkgname-0001-description.patch

ok, I'll fix that up.
>
> DEPENDENCIES

oops, sorry.

>
> Best regards,
> Thomas
Alex Bennée April 17, 2014, 11:45 a.m. UTC | #5 
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

<snip>
>> +diff --git a/Makefile.am b/Makefile.am
>
> You're patching Makefile.am here...
>
>
>> +ZILE_VERSION = 2.4.11
>> +ZILE_SITE = http://ftp.gnu.org/gnu/zile/
>> +ZILE_LICENSE = GPLv1+
>> +ZILE_LICENSE_FILES = COPYING
>> +ZILE_CONF_OPT += --without-help2man
>> +ZILE_DEPENDANCIES += libgc
>
> but you never mark zile as requiring autoreconf using ZILE_AUTORECONF =
> YES. How can this work?

I assume the make machinery picked it up, will fix.

>
> Also, use '=' instead of '+=' above.
>
> And use $(BR2_GNU_MIRROR) for the download URL.
>
> Thanks!

Will send v3 once I've re-built and tested.

>
> Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 0e7e246..ad1f4c1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1119,6 +1119,7 @@  source "package/uemacs/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/vim/Config.in"
 endif
+source "package/zile/Config.in"
 endmenu
 
 endmenu
diff --git a/package/zile/Config.in b/package/zile/Config.in
new file mode 100644
index 0000000..163b44d
--- /dev/null
+++ b/package/zile/Config.in
@@ -0,0 +1,13 @@ 
+config BR2_PACKAGE_ZILE
+	bool "zile"
+	select BR2_PACKAGE_LIBGC
+	depends on BR2_USE_MMU # fork()
+	help
+	  Zile is Lossy Emacs
+
+	  GNU Zile (Zile Is Lossy Emacs) is a lightweight Emacs clone. Every
+	  Emacs user should feel at home with Zile. Zile is aimed at small
+	  footprint systems (a typical binary is about 100Kb) and quick editing
+	  sessions (it starts up and shuts down instantly).
+
+	  http://www.gnu.org/software/zile/
diff --git a/package/zile/remove-help2man.patch b/package/zile/remove-help2man.patch
new file mode 100644
index 0000000..d397543
--- /dev/null
+++ b/package/zile/remove-help2man.patch
@@ -0,0 +1,30 @@ 
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
+
+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/package/zile/zile.mk b/package/zile/zile.mk
new file mode 100644
index 0000000..b641fe6
--- /dev/null
+++ b/package/zile/zile.mk
@@ -0,0 +1,14 @@ 
+################################################################################
+#
+# Zile
+#
+################################################################################
+
+ZILE_VERSION = 2.4.11
+ZILE_SITE = http://ftp.gnu.org/gnu/zile/
+ZILE_LICENSE = GPLv1+
+ZILE_LICENSE_FILES = COPYING
+ZILE_CONF_OPT += --without-help2man
+ZILE_DEPENDANCIES += libgc
+
+$(eval $(autotools-package))