diff --git a/component/automake/automake-1.15-shebang_workaround.patch b/component/automake/automake-1.15-shebang_workaround.patch new file mode 100644 index 0000000000000000000000000000000000000000..ed983a6bd27eb49e66b02547d7fa9a8b86f2748d --- /dev/null +++ b/component/automake/automake-1.15-shebang_workaround.patch @@ -0,0 +1,17 @@ +--- automake-1.15/doc/help2man 2014-12-30 14:49:41.000000000 +0100 ++++ automake-1.15/doc/help2man 2017-04-12 10:40:16.965600755 +0200 +@@ -632,11 +632,13 @@ + sub get_option_value + { + my ($prog, $opt) = @_; ++ $prog = `which $prog`; ++ chomp($prog); + my $stderr = $discard_stderr ? '/dev/null' : '&1'; + my $value = join '', + map { s/ +$//; expand $_ } + map { dec $_ } +- `$prog $opt 2>$stderr`; ++ `perl $prog $opt 2>$stderr`; + + unless ($value) + { diff --git a/component/automake/buildout.cfg b/component/automake/buildout.cfg index bb346da864e0225a5efdf61768a3c808ca373be8..4e5adaaae197cc67055120416e7ec1ecde640a68 100644 --- a/component/automake/buildout.cfg +++ b/component/automake/buildout.cfg @@ -1,6 +1,7 @@ [buildout] extends = ../autoconf/buildout.cfg + ../patch/buildout.cfg ../perl/buildout.cfg ../xz-utils/buildout.cfg parts = @@ -10,5 +11,8 @@ parts = recipe = slapos.recipe.cmmi md5sum = 9a1ddb0e053474d9d1105cfe39b0c48d url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz +patch-options = -p1 +patches = + ${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e environment = - PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s + PATH=${autoconf:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s