Package: pristine-tar
Version: 1.33
Tags: patch
The XDELTA_PROGRAM build parameter may be used to define the xdelta
binary to be used by pristine-tar. This patch increases compatibility
with many non-Debian systems that do ship xdelta 3 by default.
Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com>
---
pristine-gz | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pristine-gz b/pristine-gz
index 5ca9f65..973c7fb 100755
--- a/pristine-gz
+++ b/pristine-gz
@@ -96,6 +96,11 @@ use File::Basename qw/basename/;
delete $ENV{GZIP};
+# The following assignment is potentially munged during the
+# build process to hold the value of XDELTA_PROGRAM
+# parameter as given to Makefile.PL.
+my $xdelta_program = "xdelta";
+
dispatch(
commands => {
usage => [\&usage],
@@ -234,7 +239,7 @@ sub reproducegz {
else {
# generate a binary delta and see if this is the
# best variant so far
- my $ret=system("xdelta delta -0 --pristine $tempout
$orig $tempdir/tmpdelta 2>/dev/null") >> 8;
+ my $ret=system("$xdelta_program delta -0 --pristine
$tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
# xdelta exits 1 on success
if ($ret == 1) {
my $size=(stat("$tempdir/tmpdelta"))[7];
@@ -297,7 +302,7 @@ sub gengz {
my $tempdir=tempdir();
my $tfile="$tempdir/".basename($file).".gz";
doit_redir($file, $tfile, @zgz);
- doit("xdelta", "patch", "--pristine", $delta->{delta}, $tfile,
"$file.gz");
+ doit("$xdelta_program", "patch", "--pristine", $delta->{delta},
$tfile, "$file.gz");
}
else {
doit_redir("$file", "$file.gz", @zgz);
--
2.1.4
