git://git.jankratochvil.net
/
macros.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+GCC_NEED_DECLARATION(): See whether we need a declaration for a function.
[macros.git]
/
AutoGen.pm
diff --git
a/AutoGen.pm
b/AutoGen.pm
index
5075ee6
..
1fad581
100644
(file)
--- a/
AutoGen.pm
+++ b/
AutoGen.pm
@@
-19,6
+19,7
@@
package AutoGen;
package AutoGen;
+require 5.6.0; # at least 'use warnings;' but we need some 5.6.0+ modules anyway
use vars qw($VERSION);
$VERSION=do { my @r=(q$Revision$=~/\d+/g); sprintf "%d.".("%03d"x$#r),@r; };
use strict;
use vars qw($VERSION);
$VERSION=do { my @r=(q$Revision$=~/\d+/g); sprintf "%d.".("%03d"x$#r),@r; };
use strict;
@@
-160,19
+161,21
@@
my($class,%args)=@_;
"ARGV"=>["--copy"],
"configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]],
);
"ARGV"=>["--copy"],
"configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]],
);
+ _remove "ChangeLog"; # force its rebuild by Makefile/rcs2log
_system "make dist $name.spec";
_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
_system "make dist $name.spec";
_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
- _system(join(" ","rpm",
+ _system(join(" ","rpm
build
",
"-ba",
"-ba",
+ "--rmsource", # _remove _rpmeval("_sourcedir")."/$name-*.tar.gz";
+ "--clean", # _remove _rpmeval("_builddir")."/$name-VERSION";
(!$args{"sign"} ? () : "--sign"),
"$name.spec",
));
_system "make dist-tarZ" if $Options{"dist-tarZ"};
(!$args{"sign"} ? () : "--sign"),
"$name.spec",
));
_system "make dist-tarZ" if $Options{"dist-tarZ"};
- _remove _rpmeval{"_sourcedir"}."/$name-*.tar.gz";
- _move _rpmeval{"_srcrpmdir"}."/$name-*.src.rpm",".";
- _move "nocheck",_rpmeval{"_rpmdir"}."/"._rpmeval{"_arch"}."/$name-*."._rpmeval{"_arch"}.".rpm",".";
+ _move _rpmeval("_srcrpmdir")."/$name-*.src.rpm",".";
+ _move _rpmeval("_rpmdir")."/"._rpmeval("_target_cpu")."/$name-*."._rpmeval("_target_cpu").".rpm",".";
_system "ls -l $name-*";
_system "ls -l $name-*";
- # NOTREACHED
+ exit 0; # should never return
}
# WARNING: doesn't respect %Options change!
}
# WARNING: doesn't respect %Options change!
@@
-212,10
+215,11
@@
sub _cleanfiles
./confdefs.h ./conftest* ./autoh[0-9]* ./confcache
./config.rpath
./depcomp
./confdefs.h ./conftest* ./autoh[0-9]* ./confcache
./config.rpath
./depcomp
+ ./compile
./stamp-h ./stamp-h.in ./stamp-h1
./install-sh
./aclocal.m4
./stamp-h ./stamp-h.in ./stamp-h1
./install-sh
./aclocal.m4
- ./autom4te-*.cache
+ ./autom4te
.cache ./autom4te
-*.cache
./m4
./missing
./mkinstalldirs
./m4
./missing
./mkinstalldirs
@@
-344,8
+348,8
@@
my($class,%options)=@_;
Getopt::Long::Configure('noignorecase','prefix_pattern=(--|-|\+|)');
local @ARGV=@{$Options{"ARGV"}};
print _help() and confess if !GetOptions(
Getopt::Long::Configure('noignorecase','prefix_pattern=(--|-|\+|)');
local @ARGV=@{$Options{"ARGV"}};
print _help() and confess if !GetOptions(
- "rpm" ,sub { $class->_rpmbuild("sign"=>1);
return;
},
- "rpmtest" ,sub { $class->_rpmbuild("sign"=>0);
return;
},
+ "rpm" ,sub { $class->_rpmbuild("sign"=>1); },
+ "rpmtest" ,sub { $class->_rpmbuild("sign"=>0); },
"dist" ,\$Options{"ARGV_dist"},
"copy!" ,\$Options{"ARGV_copy"},
"fullclean",\$Options{"ARGV_fullclean"},
"dist" ,\$Options{"ARGV_dist"},
"copy!" ,\$Options{"ARGV_copy"},
"fullclean",\$Options{"ARGV_fullclean"},
@@
-372,6
+376,8
@@
my($class,%options)=@_;
my $configure_in=_readfile("configure.in");
do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
for (\$Options{"want-gettextize"});
my $configure_in=_readfile("configure.in");
do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
for (\$Options{"want-gettextize"});
+ do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; }
+ for (\$Options{"want-glib-gettextize"});
do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
for (\$Options{"want-libtoolize"});
do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
for (\$Options{"want-libtoolize"});
do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
@@
-423,6
+429,11
@@
my($class,%options)=@_;
_writefile $Makefile_in_in,$file;
}
}
_writefile $Makefile_in_in,$file;
}
}
+ if ($Options{"want-glib-gettextize"}) {
+ _system "glib-gettextize",@copy_arg;
+ # "po/ChangeLog" is somehow missing at this point
+ File::Touch->new("atime_only"=>1)->touch("po/ChangeLog");
+ }
_system "aclocal",map((!$_ ? () : @$_),$Options{"aclocal_args"});
_system qw(libtoolize),@copy_arg if $Options{"want-libtoolize"};
_system qw(autoheader) if $Options{"want-autoheader"};
_system "aclocal",map((!$_ ? () : @$_),$Options{"aclocal_args"});
_system qw(libtoolize),@copy_arg if $Options{"want-libtoolize"};
_system qw(autoheader) if $Options{"want-autoheader"};
@@
-436,9
+447,12
@@
my($class,%options)=@_;
return if $Options{"ARGV_dist"};
return if $Options{"ARGV_dist"};
+ # 'configure' defaults to CFLAGS '-g -O2' but our --enable-maintainer-mode
+ # should force '-ggdb3'
+ $ENV{"CFLAGS"}||="";
# shared/static switching cannot be based on maintainer-mode in configure
_system(qw(./configure --enable-maintainer-mode),
# shared/static switching cannot be based on maintainer-mode in configure
_system(qw(./configure --enable-maintainer-mode),
- (
$Options{"want-libtoolize"} &&
qw(--enable-shared --disable-static)),
+ (
!$Options{"want-libtoolize"} ? () :
qw(--enable-shared --disable-static)),
map((!$_ ? () : @$_),$Options{"configure_args"}),
);
}
map((!$_ ? () : @$_),$Options{"configure_args"}),
);
}