Author: adam-guest
Date: 2008-04-15 17:14:49 +0000 (Tue, 15 Apr 2008)
New Revision: 1347
Modified:
trunk/debian/changelog
trunk/scripts/debuild.pl
Log:
+ When running dpkg-buildpackage directly, pass through unrecognised
options (with a warning) rather than aborting the build ourselves
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-15 17:06:21 UTC (rev 1346)
+++ trunk/debian/changelog 2008-04-15 17:14:49 UTC (rev 1347)
@@ -47,6 +47,8 @@
+ Automatically preserve the (C, CPP, CXX, LD and F)FLAGS variables and
the corresponding *FLAGS_EXTEND variables
+ Add *FLAGS and *FLAGS_EXTEND support to the emulated dpkg-buildpackage
+ + When running dpkg-buildpackage directly, pass through unrecognised
+ options (with a warning) rather than aborting the build ourselves
* licensecheck: Replace a literal copyright symbol with a hex escape
so that the package builds using etch's po4a (Closes: #476251)
* mergechanges:
Modified: trunk/scripts/debuild.pl
===================================================================
--- trunk/scripts/debuild.pl 2008-04-15 17:06:21 UTC (rev 1346)
+++ trunk/scripts/debuild.pl 2008-04-15 17:14:49 UTC (rev 1347)
@@ -834,7 +834,13 @@
push(@dpkg_opts, $_), next;
# dpkg-cross specific option
if (/^-M/ and $dpkg_cross) { push(@dpkg_opts, $_), next; }
- fatal "unknown dpkg-buildpackage option in configuration file: $_";
+ if ($emulate_dpkgbp) {
+ fatal "unknown dpkg-buildpackage option in configuration file: $_";
+ } else {
+ warn "$progname: unknown dpkg-buildpackage option in configuration
file: $_\n";
+ push (@dpkg_opts, $_);
+ next;
+ }
}
while ($_=shift) {
@@ -882,7 +888,13 @@
unshift @ARGV, $_;
last;
}
- fatal "unknown dpkg-buildpackage/debuild option: $_";
+ if ($emulate_dpkgbp) {
+ fatal "unknown dpkg-buildpackage/debuild option: $_";
+ } else {
+ warn "$progname: unknown dpkg-buildpackage/debuild option: $_\n";
+ push (@dpkg_opts, $_);
+ next;
+ }
}
if ($sourceonly and $binaryonly) {
--
To unsubscribe, send mail to [EMAIL PROTECTED]
