SecBSD's official ports repository
This commit is contained in:
commit
2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
76
devel/autoconf/2.57/patches/patch-bin_autom4te_in
Normal file
76
devel/autoconf/2.57/patches/patch-bin_autom4te_in
Normal file
|
@ -0,0 +1,76 @@
|
|||
Index: bin/autom4te.in
|
||||
--- bin/autom4te.in.orig
|
||||
+++ bin/autom4te.in
|
||||
@@ -28,6 +28,7 @@ BEGIN
|
||||
{
|
||||
my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
|
||||
unshift @INC, "$datadir";
|
||||
+ push @INC, '.';
|
||||
}
|
||||
|
||||
## --------- ##
|
||||
@@ -276,16 +277,8 @@ my $freeze = 0;
|
||||
|
||||
# $M4.
|
||||
my $m4 = $ENV{"M4"} || '@M4@';
|
||||
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
|
||||
-error "need GNU m4 1.4 or later: $m4"
|
||||
- if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
|
||||
+$m4 .=" -g -D__gnu__";
|
||||
|
||||
-# Set some high recursion limit as the default limit, 250, has already
|
||||
-# been hit with AC_OUTPUT. Don't override the user's choice.
|
||||
-$m4 .= ' --nesting-limit=1024'
|
||||
- if " $m4 " !~ / (--nesting-limit|-L) /;
|
||||
-
|
||||
-
|
||||
# @M4_BUILTIN -- M4 builtins and a useful comment.
|
||||
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
|
||||
map { s/:.*//;s/\W// } @m4_builtin;
|
||||
@@ -660,12 +653,11 @@ sub handle_m4 ($@)
|
||||
# We don't output directly to the cache files, to avoid problems
|
||||
# when we are interrupted (that leaves corrupted files).
|
||||
xsystem ("$m4"
|
||||
- . join (' --include=', '', @include)
|
||||
- . " --define=m4_warnings=$m4_warnings"
|
||||
- . ' --debug=aflq'
|
||||
- . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
|
||||
- . " --error-output=$tcache" . $req->id . "t"
|
||||
- . join (' --trace=', '', sort @macro)
|
||||
+ . join (' -I ', '', @include)
|
||||
+ . " -Dm4_warnings=$m4_warnings"
|
||||
+ . ' -daflq'
|
||||
+ . " -o$tcache" . $req->id . "t"
|
||||
+ . join (' -t', '', sort @macro)
|
||||
. " " . files_to_options (@ARGV)
|
||||
. ' </dev/null'
|
||||
. " >$ocache" . $req->id . "t");
|
||||
@@ -1117,8 +1109,7 @@ sub freeze ($)
|
||||
# When processing the file with diversion disabled, there must be no
|
||||
# output but comments and empty lines.
|
||||
my $result = xqx ("$m4"
|
||||
- . ' --fatal-warning'
|
||||
- . join (' --include=', '', @include)
|
||||
+ . join (' -I ', '', @include)
|
||||
. ' --define=divert'
|
||||
. " " . files_to_options (@ARGV)
|
||||
. ' </dev/null');
|
||||
@@ -1131,8 +1122,7 @@ sub freeze ($)
|
||||
# If freezing produces output, something went wrong: a bad `divert',
|
||||
# or an improper paren etc.
|
||||
xsystem ("$m4"
|
||||
- . ' --fatal-warning'
|
||||
- . join (' --include=', '', @include)
|
||||
+ . join (' -I ', '', @include)
|
||||
. " --freeze-state=$output"
|
||||
. " " . files_to_options (@ARGV)
|
||||
. ' </dev/null');
|
||||
@@ -1145,7 +1135,7 @@ sub freeze ($)
|
||||
mktmpdir ('am4t');
|
||||
load_configuration ($ENV{'AUTOM4TE_CFG'} || "$datadir/autom4te.cfg");
|
||||
load_configuration ("$ENV{'HOME'}/.autom4te.cfg")
|
||||
- if -f "$ENV{'HOME'}/.autom4te.cfg";
|
||||
+ if defined $ENV{'HOME'} and -f "$ENV{'HOME'}/.autom4te.cfg";
|
||||
load_configuration (".autom4te.cfg")
|
||||
if -f ".autom4te.cfg";
|
||||
parse_args;
|
Loading…
Add table
Add a link
Reference in a new issue