Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/files/, dev-libs/openssl/
Date: Thu, 04 Jan 2018 19:50:16
Message-Id: 1515095381.2a74795f2cb6221e104b6d5150db62f0c1b59af4.grobian@gentoo
1 commit: 2a74795f2cb6221e104b6d5150db62f0c1b59af4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 19:49:41 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 19:49:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2a74795f
7
8 dev-libs/openssl: add patch for FreeMiNT by Alan Hourihane
9
10 Closes: https://bugs.gentoo.org/643410
11 Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
12
13 dev-libs/openssl/files/openssl-1.0.2l-mint.patch | 33 ++++++++++++++++++++++++
14 dev-libs/openssl/openssl-1.0.2l.ebuild | 3 ++-
15 2 files changed, 35 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-libs/openssl/files/openssl-1.0.2l-mint.patch b/dev-libs/openssl/files/openssl-1.0.2l-mint.patch
18 new file mode 100644
19 index 0000000000..2afcb3f2de
20 --- /dev/null
21 +++ b/dev-libs/openssl/files/openssl-1.0.2l-mint.patch
22 @@ -0,0 +1,33 @@
23 +--- Configure
24 ++++ Configure
25 +@@ -502,6 +502,9 @@
26 + # Interix (GCC)
27 + "interix-gcc", "gcc:-D_ALL_SOURCE -DL_ENDIAN -DTERMIOS -O2 -Wall::-D_REENTRANT::-ldl:::::::::::::dlfcn:gnu:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
28 +
29 ++# FreeMiNT (GCC)
30 ++"mint-gcc", "gcc:-O2 -fomit-frame-pointer -DB_ENDIAN -DTERMIOS::-D_REENTRANT:::BN_LLONG:::",
31 ++
32 + # Borland C++ 4.5
33 + "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
34 +
35 +--- config
36 ++++ config
37 +@@ -170,6 +170,10 @@
38 + echo "${MACHINE}-whatever-linux1"; exit 0
39 + ;;
40 +
41 ++ FreeMiNT*)
42 ++ echo "m68k-atari-mint"; exit 0;
43 ++ ;;
44 ++
45 + GNU*)
46 + echo "hurd-x86"; exit 0;
47 + ;;
48 +@@ -859,6 +863,7 @@
49 + *-*-qnx6) OUT="QNX6" ;;
50 + x86-*-android|i?86-*-android) OUT="android-x86" ;;
51 + armv[7-9]*-*-android) OUT="android-armv7" ;;
52 ++ *-mint*) OUT="mint-gcc" ;;
53 + *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
54 + esac
55 +
56
57 diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild
58 index 2022ae6658..21850a7d25 100644
59 --- a/dev-libs/openssl/openssl-1.0.2l.ebuild
60 +++ b/dev-libs/openssl/openssl-1.0.2l.ebuild
61 @@ -1,4 +1,4 @@
62 -# Copyright 1999-2017 Gentoo Foundation
63 +# Copyright 1999-2018 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65
66 EAPI="5"
67 @@ -79,6 +79,7 @@ src_prepare() {
68 epatch "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch
69 epatch "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch
70 epatch "${FILESDIR}"/${PN}-1.0.2l-winnt.patch # parity
71 + epatch "${FILESDIR}"/${PN}-1.0.2l-mint.patch
72
73 # remove -arch for Darwin
74 sed -i '/^"darwin/s,-arch [^ ]\+,,g' Configure || die