Bug#835447: libmodule-build-withxspp-perl: please make the output reproducible

[Chris Lamb]

gregor herrmann wrote:

> Patch applied and ...
> 
> ... and then the package doesn't build for me, the tests fail with:

My sincere apologies; I tidied the patch prior to sending and made a stupid
typo. An apdated —  tested — patch is attached.

If it helps, interdiff is just /$this/$self/.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-

Description: Make output reproducible.
 The call to Cwd::abs_path introduces the build directory into
 target. The patch changes this to use the path relative to the build directory.
 (For background and details cf. the Debian bug below.)
Origin: vendor
Bug-Debian: https://bugs.debian.org/835447
Author: Chris Lamb <la...@debian.org>
Reviewed-by: gregor herrmann <gre...@debian.org>
Last-Update: 2016-08-26

--- libmodule-build-withxspp-perl-0.14.orig/lib/Module/Build/WithXSpp.pm
+++ libmodule-build-withxspp-perl-0.14/lib/Module/Build/WithXSpp.pm
@@ -2,6 +2,7 @@ package Module::Build::WithXSpp;
 use strict;
 use warnings;
 
+use File::Spec;
 use Module::Build;
 use ExtUtils::CppGuess ();
 
@@ -228,11 +229,11 @@ MODULE = $module_name	PACKAGE = $module_
 HERE
 
   my $typemap_args = '';
-  $typemap_args .= '-t "' . _naive_shell_escape(Cwd::abs_path($_)) . '" ' foreach keys %$xspt_files;
+  $typemap_args .= '-t "' . _naive_shell_escape(File::Spec->abs2rel($_, $self->build_dir)) . '" ' foreach keys %$xspt_files;
 
   foreach my $xsp_file (keys %$xsp_files) {
-    my $full_path_file = _naive_shell_escape( Cwd::abs_path($xsp_file) );
-    my $cmd = qq{INCLUDE_COMMAND: \$^X -MExtUtils::XSpp::Cmd -e xspp -- $typemap_args "$full_path_file"\n\n};
+    my $relative_path_file = _naive_shell_escape( File::Spec->abs2rel($xsp_file, $self->build_dir) );
+    my $cmd = qq{INCLUDE_COMMAND: \$^X -MExtUtils::XSpp::Cmd -e xspp -- $typemap_args "$relative_path_file"\n\n};
     $xs_code .= $cmd;
   }