public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/
@ 2016-03-05 20:32 Andreas Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2016-03-05 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2817239c931f3f90a80a6a9d215c3ac5490a0a6f
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Fri Mar  4 23:41:11 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 20:32:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2817239c

dev-perl/Net-SSLeay: Fix tests re: Networking

1. Reduce clutter for people who aren't running tests, or
aren't running tests with DIST_OVERRIDE=~/network/

2. Enable network-tests if DIST_OVERRIDE=~/network/

Package-Manager: portage-2.2.27

 dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild        | 10 ++++++++++
 .../Net-SSLeay/files/1.72-config-nettest-no.patch    | 20 ++++++++++++++++++++
 .../Net-SSLeay/files/1.72-config-nettest-yes.patch   | 20 ++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild
index fb93cb8..0c76338 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild
@@ -39,9 +39,19 @@ src_prepare() {
 		-e "/\$opts->{optimize} = '-O2 -g';/d" \
 		-e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
 		inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
+
+	local my_test_control
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+
 	if use test; then
 		perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t'
 	fi
+	if use test && has network ${my_test_control} ; then
+		eapply "${FILESDIR}/${DIST_VERSION}-config-nettest-yes.patch"
+	else
+		eapply "${FILESDIR}/${DIST_VERSION}-config-nettest-no.patch"
+	fi
+
 	perl-module_src_prepare
 }
 src_install() {

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
new file mode 100644
index 0000000..0090bfd
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
@@ -0,0 +1,20 @@
+diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
++++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:29:36.997983312 +0000
+@@ -47,15 +47,7 @@
+         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
+     );
+ 
+-    if ( $self->prompt(
+-            "Do you want to run external tests?\n".
+-            "These tests *will* *fail* if you do not have network connectivity.",
+-            'n',
+-    ) =~ /^y/i ) {
+-        $self->tests('t/*/*.t t/*/*/*.t');
+-    } else {
+-        $self->tests('t/local/*.t t/handle/local/*.t');
+-    }
++    $self->tests('t/local/*.t t/handle/local/*.t');
+ }
+ 
+ sub ssleay_get_build_opts {

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
new file mode 100644
index 0000000..d796625
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
@@ -0,0 +1,20 @@
+diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
++++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:28:49.543069218 +0000
+@@ -47,15 +47,7 @@
+         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
+     );
+ 
+-    if ( $self->prompt(
+-            "Do you want to run external tests?\n".
+-            "These tests *will* *fail* if you do not have network connectivity.",
+-            'n',
+-    ) =~ /^y/i ) {
+-        $self->tests('t/*/*.t t/*/*/*.t');
+-    } else {
+-        $self->tests('t/local/*.t t/handle/local/*.t');
+-    }
++    $self->tests('t/*/*.t t/*/*/*.t');
+ }
+ 
+ sub ssleay_get_build_opts {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/
@ 2018-05-01  0:17 Kent Fredric
  0 siblings, 0 replies; 4+ messages in thread
From: Kent Fredric @ 2018-05-01  0:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e03a06c1bdc974e0a7cfff6cef74a05745f73395
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 00:15:36 2018 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue May  1 00:17:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03a06c1

dev-perl/Net-SSLeay: Cleanup old re bug #614462

Closes: https://bugs.gentoo.org/614462
Closes: https://bugs.gentoo.org/630390
Package-Manager: Portage-2.3.29, Repoman-2.3.9

 dev-perl/Net-SSLeay/Manifest                       |  1 -
 dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild      | 56 ----------------------
 .../Net-SSLeay/files/1.72-config-nettest-no.patch  | 20 --------
 .../Net-SSLeay/files/1.72-config-nettest-yes.patch | 20 --------
 4 files changed, 97 deletions(-)

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 76a6996f48c..45ff273e456 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,2 +1 @@
-DIST Net-SSLeay-1.81.tar.gz 396631 BLAKE2B dfd0f14bbeb3196009d7e597c0c933dbe9cb7f9d4591ae62adc94a94d1b67d6e108992c7053defcea9b0c6dad90be3b26c1d53cea9e87a09016964d09fe2c5bd SHA512 8d4b72ede74ea22cf2ed681a8441f40965331cd5d4442c19677cf5bc7c1e61ed1e50d0f3a4f1b272428485bcc132ec99b0c75344ca43e8a34a9dd15539719f55
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
deleted file mode 100644
index bb4652597fb..00000000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIKEM
-DIST_VERSION=1.81
-DIST_EXAMPLES=("examples/*")
-inherit multilib perl-module
-
-DESCRIPTION="Perl extension for using OpenSSL"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl test minimal examples"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	virtual/perl-MIME-Base64
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			dev-perl/Test-Exception
-			dev-perl/Test-Warn
-			dev-perl/Test-NoWarnings
-		)
-		virtual/perl-Test-Simple
-	)
-"
-export OPTIMIZE="$CFLAGS"
-export OPENSSL_PREFIX=${EPREFIX}/usr
-
-src_prepare() {
-	sed -i \
-		-e "/\$opts->{optimize} = '-O2 -g';/d" \
-		-e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
-		inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
-
-	local my_test_control
-	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
-
-	if use test; then
-		perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t'
-	fi
-	if use test && has network ${my_test_control} ; then
-		eapply "${FILESDIR}/1.72-config-nettest-yes.patch"
-	else
-		eapply "${FILESDIR}/1.72-config-nettest-no.patch"
-	fi
-
-	perl-module_src_prepare
-}

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
deleted file mode 100644
index 0090bfd83a0..00000000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:29:36.997983312 +0000
-@@ -47,15 +47,7 @@
-         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
-     );
- 
--    if ( $self->prompt(
--            "Do you want to run external tests?\n".
--            "These tests *will* *fail* if you do not have network connectivity.",
--            'n',
--    ) =~ /^y/i ) {
--        $self->tests('t/*/*.t t/*/*/*.t');
--    } else {
--        $self->tests('t/local/*.t t/handle/local/*.t');
--    }
-+    $self->tests('t/local/*.t t/handle/local/*.t');
- }
- 
- sub ssleay_get_build_opts {

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
deleted file mode 100644
index d79662593f4..00000000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:28:49.543069218 +0000
-@@ -47,15 +47,7 @@
-         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
-     );
- 
--    if ( $self->prompt(
--            "Do you want to run external tests?\n".
--            "These tests *will* *fail* if you do not have network connectivity.",
--            'n',
--    ) =~ /^y/i ) {
--        $self->tests('t/*/*.t t/*/*/*.t');
--    } else {
--        $self->tests('t/local/*.t t/handle/local/*.t');
--    }
-+    $self->tests('t/*/*.t t/*/*/*.t');
- }
- 
- sub ssleay_get_build_opts {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/
@ 2020-04-15 12:29 Kent Fredric
  0 siblings, 0 replies; 4+ messages in thread
From: Kent Fredric @ 2020-04-15 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     66c6463987bd802e86c4de5595fd8ed4de21771b
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 15 11:59:06 2020 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Apr 15 12:28:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c64639

dev-perl/Net-SSLeay: Remove old 1.820.0

Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 dev-perl/Net-SSLeay/Manifest                       |  1 -
 dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild      | 58 ----------------------
 .../files/Net-SSLeay-1.82-fix-libdir.patch         | 27 ----------
 .../files/Net-SSLeay-1.82-fix-network-tests.patch  | 29 -----------
 .../files/Net-SSLeay-1.82-respect-cflags.patch     | 26 ----------
 5 files changed, 141 deletions(-)

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 53c8e6fefb7..23f7c63a02e 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,2 +1 @@
-DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
 DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
deleted file mode 100644
index b2f24506d37..00000000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIKEM
-DIST_VERSION=1.82
-DIST_EXAMPLES=("examples/*")
-inherit multilib perl-module
-
-DESCRIPTION="Perl extension for using OpenSSL"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl test minimal examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	virtual/perl-MIME-Base64
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			dev-perl/Test-Exception
-			dev-perl/Test-Warn
-			dev-perl/Test-NoWarnings
-		)
-		virtual/perl-Test-Simple
-	)
-"
-export OPTIMIZE="$CFLAGS"
-export OPENSSL_PREFIX=${EPREFIX}/usr
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.82-respect-cflags.patch"
-	"${FILESDIR}/${PN}-1.82-fix-libdir.patch"
-	"${FILESDIR}/${PN}-1.82-fix-network-tests.patch"
-)
-
-src_prepare() {
-	use test && perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t'
-	perl-module_src_prepare
-}
-
-src_configure() {
-	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-		export NETWORK_TESTS=yes
-	else
-		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
-		export NETWORK_TESTS=no
-	fi
-	export LIBDIR=$(get_libdir)
-	perl-module_src_configure
-}

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
deleted file mode 100644
index 6aff3f85ab2..00000000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Bug: https://bugs.gentoo.org/416339
-
-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";
-     }
-     for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
--      push @{$opts->{lib_paths}}, $_ if -d $_;
-     }
- 
-     my $rsaref  = $self->ssleay_is_rsaref;

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch
deleted file mode 100644
index 6c3e76858e7..00000000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 36c14369372f0371e033019c9cea197b31a93bde Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 5 Mar 2016 12:41:11 +1300
-Subject: Fix network tests re: Networking
-
----
- inc/Module/Install/PRIVATE/Net/SSLeay.pm | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-index 0a3aa24..f27b43f 100644
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-@@ -46,11 +46,7 @@ EOM
-         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
-     );
- 
--    if ( $self->prompt(
--            "Do you want to run external tests?\n".
--            "These tests *will* *fail* if you do not have network connectivity.",
--            'n',
--    ) =~ /^y/i ) {
-+    if ( 'yes' eq ( $ENV{NETWORK_TESTS} || '' ) ) {
-         $self->tests('t/*/*.t t/*/*/*.t');
-     } else {
-         $self->tests('t/local/*.t t/handle/local/*.t');
--- 
-2.14.3
-

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch
deleted file mode 100644
index 03d06b6b8d4..00000000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8472348e588c16ad5332fe0b1f1dc9cc8eb4ab7d Mon Sep 17 00:00:00 2001
-From: Torsten Veller <tove@gentoo.org>
-Date: Mon, 16 Jul 2012 05:31:43 +1200
-Subject: Respect CFLAGS
-
-Bug: https://bugs.gentoo.org/378657
----
- 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 5abcf70..49913e6 100644
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-@@ -129,7 +129,7 @@ EOM
- 
-         if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
-             print "*** Enabling HPUX aCC options (+e)\n";
--            $opts->{optimize} = '+e -O2 -g';
-+            $opts->{optimize} = '+e ' . $opts->{optimize};
-         }
- 
-         if ( (($Config{ccname} || $Config{cc}) eq 'gcc') && ($Config{cccdlflags} =~ /-fpic/) ) {
--- 
-2.14.3
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/
@ 2024-06-29 19:26 Luca Barbato
  0 siblings, 0 replies; 4+ messages in thread
From: Luca Barbato @ 2024-06-29 19:26 UTC (permalink / raw
  To: gentoo-commits

commit:     746867587754355b9aa2c69c6e4b6eac31747d81
Author:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 11:15:28 2024 +0000
Commit:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 19:26:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74686758

dev-perl/Net-SSLeay: Remove a runtime check for the libssl version

It breaks cross-emerge and should be redundant for us.

Signed-off-by: Luca Barbato <lu_zero <AT> gentoo.org>

 dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild      |  1 +
 .../Net-SSLeay-1.940.0-avoid-runtime-check.patch   | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild
index b6b76ace6618..525f892ef56c 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.88-fix-network-tests.patch"
+	"${FILESDIR}/${PN}-1.940.0-avoid-runtime-check.patch"
 )
 
 PERL_RM_FILES=(

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-avoid-runtime-check.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-avoid-runtime-check.patch
new file mode 100644
index 000000000000..ed6019060926
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-avoid-runtime-check.patch
@@ -0,0 +1,26 @@
+From 5219e8c5181b3a819b89032766340d5c1b11c3c5 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero@gentoo.org>
+Date: Sat, 29 Jun 2024 21:10:06 +0200
+Subject: [PATCH] Remove the runtime check
+
+Makes simpler to cross-build. At least for Gentoo it is fine since we
+control the versions on our own.
+---
+ Makefile.PL | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 94c72f2..d4b1aea 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -196,7 +196,6 @@ EOM
+         exit MISSING_PREREQ;
+     }
+ 
+-    check_openssl_version($prefix, $exec);
+     my %args = (
+         CCCDLFLAGS => $opts->{cccdlflags},
+         OPTIMIZE => $opts->{optimize},
+-- 
+2.45.2
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-06-29 19:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-29 19:26 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/ Luca Barbato
  -- strict thread matches above, loose matches on Subject: below --
2020-04-15 12:29 Kent Fredric
2018-05-01  0:17 Kent Fredric
2016-03-05 20:32 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox