[libsdl-perl] 04/04: reproducible build patch: don't mess with XS build...

dod at debian.org dod at debian.org
Tue May 26 18:03:28 UTC 2015


This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libsdl-perl.

commit deca3595d085baab94cba6035923c3aca8b59341
Author: Dominique Dumont <dod at debian.org>
Date:   Tue May 26 13:42:11 2015 +0200

    reproducible build patch: don't mess with XS build...
    
    Using sort in there broke the build. Also removed parts of the patch
    that are not relevant (Darwin) or redundant (sort keys used to assign
    to a hash)
---
 debian/patches/reproducible-build | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/patches/reproducible-build b/debian/patches/reproducible-build
index 8ca6262..20c6e06 100644
--- a/debian/patches/reproducible-build
+++ b/debian/patches/reproducible-build
@@ -1,35 +1,9 @@
 Description:  Fix reproducible build
- Replaced all occurence of 'keys %foo' with 'sort keys %foo' in Build.PL and  lib used by Build.PL (in inc)
+ Replaced relevant occurence of 'keys %foo' with 'sort keys %foo' in libs used by Build.PL (in inc)
 Forwarded: NA
 Author: dod
---- a/Build.PL
-+++ b/Build.PL
-@@ -558,7 +558,7 @@
- ### Mangle the compilable files into a format Module::Build can understand
- my %xs =
- 	map { $subsystems{$_}{file}{from} => $subsystems{$_}{file}{to} }
--	keys %subsystems;
-+	sort keys %subsystems;
- 
- ### Standard Module::Build stuff
- $My::Builder::config = $My::Builder::config;       # Prevent a warning
 --- a/inc/My/Builder.pm
 +++ b/inc/My/Builder.pm
-@@ -51,11 +51,11 @@
- 
- 	return unless defined($file_args);
- 
--	my @old_values = @$properties{ keys %$file_args };
--	@$properties{ keys %$file_args } = values %$file_args;
-+	my @old_values = @$properties{ sort keys %$file_args };
-+	@$properties{ sort keys %$file_args } = values %$file_args;
- 
- 	$self->SUPER::process_xs($file);
--	@$properties{ keys %$file_args } = @old_values;
-+	@$properties{ sort keys %$file_args } = @old_values;
- }
- 
- # which headers are installed?
 @@ -101,7 +101,7 @@
  sub translate_table {
  	my ( $self, $subsystems, $libraries ) = @_;
@@ -39,14 +13,3 @@ Author: dod
  		my $p = $subsystems->{$m}->{file}->{to};
  		$p =~ s|^lib/(.*)\.xs|$1|;
  		$p =~ s|/|::|g;
---- a/inc/My/Builder/Darwin.pm
-+++ b/inc/My/Builder/Darwin.pm
-@@ -90,7 +90,7 @@
-         $inc_lib_candidates->{ $ENV{SDL_INC} } = $ENV{SDL_LIB};
-     }
- 
--    foreach ( keys %$inc_lib_candidates ) {
-+    foreach ( sort keys %$inc_lib_candidates ) {
-         my $ld = $inc_lib_candidates->{$_};
-         next unless -d $ld;
-         my ($found_lib) = _find_file( $ld,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsdl-perl.git



More information about the Pkg-perl-cvs-commits mailing list