gentoo resync : 04.12.2017

1 files changed, 21 insertions, 20 deletions

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
index 43dd224ef2d8..6aff3f85ab22 100644
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
@@ -1,26 +1,27 @@
-From 7beee46a64a9af1a7edf6bb9011327b4a08e353a Mon Sep 17 00:00:00 2001
-From: Torsten Veller <tove@gentoo.org>
-Date: Mon, 16 Jul 2012 05:31:43 +1200
-Subject: Fix libdir
-
 Bug: https://bugs.gentoo.org/416339
----
- inc/Module/Install/PRIVATE/Net/SSLeay.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-index 49913e6..0a3aa24 100644
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-@@ -67,7 +67,7 @@ sub ssleay_get_build_opts {
+The previous patch for the above bug report used $ENV{LIBDIR} but this
+wasn't enough to help with cross-compiling. We could use $ENV{SYSROOT}
+but this results in a bogus RPATH entry. It is better to simply trust
+the toolchain, which may have its own sysroot applied.
+
+Cross-compiling Perl modules requires additional hackery but at least
+that hackery will work now. :)
+
+Chewi
+2017/12/03
+
+diff -Naur a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2017-10-13 01:38:01.000000000 +0100
++++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2017-12-03 10:52:27.304861804 +0000
+@@ -65,10 +65,8 @@
+         cccdlflags => '',
+     };
      for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
-       push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
+-      push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
      }
--    for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
-+    for ($prefix, "$prefix/$ENV{LIBDIR}", "$prefix/out32dll") {
-       push @{$opts->{lib_paths}}, $_ if -d $_;
+     for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
+-      push @{$opts->{lib_paths}}, $_ if -d $_;
      }
  
--- 
-2.14.3
-
+     my $rsaref  = $self->ssleay_is_rsaref;