[Reproducible-commits] [perl] 27/36: Link /usr/bin/perl statically against libperl on all architectures. (Closes: #781476)

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository perl.

commit 9f69c88ee451936bbc0f19b33d4bdb9a7770e2af
Author: Niko Tyni <ntyni at debian.org>
Date:   Fri Apr 17 15:37:02 2015 +0300

    Link /usr/bin/perl statically against libperl on all architectures. (Closes: #781476)
    
    See  https://lists.debian.org/debian-devel/2015/04/msg00258.html
    for a related discussion.
    
    perl-base has to break older libperl5.20 versions because otherwise
    you could end up without libperl.so.5.20 altogether in a partial upgrade.
---
 debian/changelog     |  3 ++-
 debian/config.debian |  9 +++------
 debian/control       | 10 ++++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36b3471..0721f20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 perl (5.20.2-5) UNRELEASED; urgency=medium
 
-  * 
+  * Link /usr/bin/perl statically against libperl on all architectures.
+    (Closes: #781476)
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 06 May 2015 17:30:58 +0300
 
diff --git a/debian/config.debian b/debian/config.debian
index d6e7603..e3da0a8 100644
--- a/debian/config.debian
+++ b/debian/config.debian
@@ -53,16 +53,13 @@ case "$1" in
     --install-type)
 	# The default installation type for /usr/bin/perl of shared or
 	# static may be changed by including x-perl-static or x-perl-shared
-	# in DEB_BUILD_OPTIONS.  The default is shared except for i386 where
-	# there is a measurable performance penalty.
+	# in DEB_BUILD_OPTIONS.  The default used to vary based on the
+	# architecture but is now static everywhere. See #781476
 	case ",$DEB_BUILD_OPTIONS," in
 	    *[,\ ]x-perl-static[,\ ]*)	exec echo static;;
 	    *[,\ ]x-perl-shared[,\ ]*)	exec echo shared;;
 	esac
-	case "$arch_cpu" in
-	    i386)			exec echo static;;
-	    *)				exec echo shared;;
-	esac;;
+	exec echo static;;
 
     *)	echo "$0: need --shared, --static, or --debug option"
     	exit 2;;
diff --git a/debian/control b/debian/control
index 68c98f1..1babd4c 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Conflicts: safe-rm (<< 0.8),
  mono-gac (<< 2.10.8.1-3),
 Breaks: autoconf2.13 (<< 2.13-45),
  perl (<< 5.20.0~),
+ libperl5.20 (<< 5.20.2-5),
  pdl (<< 1:2.007-4),
  libfile-spec-perl (<< 3.4801),
  libxsloader-perl (<< 0.17),
@@ -89,13 +90,10 @@ Section: libs
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, perl-base (= ${binary:Version})
-Replaces: perl-base (<= 5.8.7-4)
+Replaces: perl-base (<< 5.20.2-5)
 Description: shared Perl library
- This package is required by programs which embed a Perl interpreter to
- ensure that the correct version of `perl-base' is installed.  It
- additionally contains the shared Perl library on architectures where the
- perl binary is linked to libperl.a (currently only i386, for performance
- reasons).  In other cases the actual library is in the `perl-base' package.
+ This package contains the shared Perl library, used by applications
+ which embed a Perl interpreter.
 
 Package: libperl-dev
 Section: libdevel

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