Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add patch for Automake 1.16.5 to fix help2man error #18468

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion easybuild/easyconfigs/a/Automake/Automake-1.16.5.eb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ toolchain = SYSTEM

source_urls = [GNU_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
checksums = ['07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605']
patches = ['Automake-1.16.5_fix-help2man-error.patch']
checksums = [
{'automake-1.16.5.tar.gz': '07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605'},
{'Automake-1.16.5_fix-help2man-error.patch': 'ebcd629aefcf6b7dbb3bc3a8abcdf71d4f7605ecda6c6eae2f93d73271df6930'},
]

dependencies = [
('Autoconf', '2.71'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
fix for:
help2man: can't get --help info from automake-1.16

based on https://github.com/xbmc/xbmc/pull/18584
--- a/Makefile.in 2020-03-16 19:11:10.000000000 -0700
+++ b/Makefile.in 2020-10-22 08:06:24.606751367 -0700
@@ -699,7 +699,7 @@
update_mans = \
$(AM_V_GEN): \
&& $(MKDIR_P) doc \
- && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@
+ && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr

amhello_sources = \
doc/amhello/configure.ac \