diff options
Diffstat (limited to 'tools/automake/patches')
3 files changed, 75 insertions, 0 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch new file mode 100644 index 000000000..827797c73 --- /dev/null +++ b/tools/automake/patches/000-relocatable.patch @@ -0,0 +1,46 @@ +--- a/aclocal.in ++++ b/aclocal.in +@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || ++ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); + unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); + } + +@@ -61,8 +62,8 @@ $perl_threads = 0; + # ACLOCAL_PATH environment variable, and reset with the `--system-acdir' + # option. + my @user_includes = (); +-my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); +-my @system_includes = ('@datadir@/aclocal'); ++my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION"); ++my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal'); + + # Whether we should copy M4 file in $user_includes[0]. + my $install = 0; +--- a/automake.in ++++ b/automake.in +@@ -31,7 +31,8 @@ package Language; + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || ++ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); + unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); + + # 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@'; + our $PACKAGE = '@PACKAGE@'; + our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; + our $VERSION = '@VERSION@'; +-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; ++our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; + our $perl_threads = @PERL_THREADS@; + + 1; diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch new file mode 100644 index 000000000..7829d0ecd --- /dev/null +++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch @@ -0,0 +1,15 @@ +--- a/aclocal.in ++++ b/aclocal.in +@@ -314,6 +314,12 @@ sub scan_m4_dirs ($@) + + foreach my $m4dir (@dirlist) + { ++ if (! -d $m4dir) ++ { ++ msg ('override', "warning: skipping not existing directory `$m4dir'"); ++ next; ++ } ++ + if (! opendir (DIR, $m4dir)) + { + fatal "couldn't open directory `$m4dir': $!"; diff --git a/tools/automake/patches/200-fix_missing_py_compile.patch b/tools/automake/patches/200-fix_missing_py_compile.patch new file mode 100644 index 000000000..b03bdff00 --- /dev/null +++ b/tools/automake/patches/200-fix_missing_py_compile.patch @@ -0,0 +1,14 @@ +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) |