diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-12-17 02:47:13 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-12-17 02:47:13 +0000 |
| commit | 7e8930847e9d83d69b3fea1b837d7128485bfd32 (patch) | |
| tree | 8594df066b0928b6207142d5d3cddbb8506f63b6 /tools/automake/patches | |
| parent | 993a9de79a0c3f82940190bf9b49c77abce47118 (diff) | |
| download | upstream-7e8930847e9d83d69b3fea1b837d7128485bfd32.tar.gz upstream-7e8930847e9d83d69b3fea1b837d7128485bfd32.tar.bz2 upstream-7e8930847e9d83d69b3fea1b837d7128485bfd32.zip | |
[tools] automake: update to 1.11.6
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39108 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/automake/patches')
3 files changed, 6 insertions, 20 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch index 827797c732..1206fdc1cb 100644 --- a/tools/automake/patches/000-relocatable.patch +++ b/tools/automake/patches/000-relocatable.patch @@ -1,6 +1,6 @@ --- a/aclocal.in +++ b/aclocal.in -@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; +@@ -27,7 +27,8 @@ BEGIN { @@ -10,7 +10,7 @@ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); } -@@ -61,8 +62,8 @@ $perl_threads = 0; +@@ -58,8 +59,8 @@ # ACLOCAL_PATH environment variable, and reset with the `--system-acdir' # option. my @user_includes = (); @@ -23,7 +23,7 @@ my $install = 0; --- a/automake.in +++ b/automake.in -@@ -31,7 +31,8 @@ package Language; +@@ -31,7 +31,8 @@ BEGIN { @@ -35,7 +35,7 @@ # Override SHELL. This is required on DJGPP so that system() uses --- a/lib/Automake/Config.in +++ b/lib/Automake/Config.in -@@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@'; +@@ -31,7 +31,7 @@ our $PACKAGE = '@PACKAGE@'; our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; our $VERSION = '@VERSION@'; diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch index 7829d0ecde..e6c3d7f335 100644 --- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch +++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch @@ -1,6 +1,6 @@ --- a/aclocal.in +++ b/aclocal.in -@@ -314,6 +314,12 @@ sub scan_m4_dirs ($@) +@@ -327,6 +327,12 @@ foreach my $m4dir (@dirlist) { @@ -12,4 +12,4 @@ + if (! opendir (DIR, $m4dir)) { - fatal "couldn't open directory `$m4dir': $!"; + if ($install && $type == FT_USER && $first_user_m4dir) diff --git a/tools/automake/patches/200-fix_missing_py_compile.patch b/tools/automake/patches/200-fix_missing_py_compile.patch deleted file mode 100644 index b03bdff00d..0000000000 --- a/tools/automake/patches/200-fix_missing_py_compile.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: automake-1.11.3/lib/am/python.am -=================================================================== ---- automake-1.11.3.orig/lib/am/python.am 2012-01-31 12:41:18.000000000 +0100 -+++ automake-1.11.3/lib/am/python.am 2012-06-07 16:42:53.488515898 +0200 -@@ -23,8 +23,8 @@ - ## Installing. ## - ## ------------ ## - --if %?INSTALL% - ?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) -+if %?INSTALL% - am__installdirs += "$(DESTDIR)$(%NDIR%dir)" - .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON - install-%DIR%PYTHON: $(%DIR%_PYTHON) |