Files
for-gentoo/dev-libs/openssl/a.patch
T

102 lines
3.0 KiB
Diff

--- a/openssl-1.0.1e-r1.ebuild
+++ b/openssl-1.0.1e-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e-r1.ebuild,v 1.16 2013/10/15 01:53:27 vapier Exp $
+# $Header: $
EAPI="4"
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
REV="1.7"
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
@@ -14,7 +14,7 @@
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc -ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
@@ -26,6 +26,10 @@
# version that lack runtime version checking. We'll drop them in
# the future.
RDEPEND="static-libs? ( ${LIB_DEPEND} )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r5
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
!<net-misc/openssh-5.9_p1-r4
!<net-libs/neon-0.29.6-r1"
@@ -35,6 +39,18 @@
test? ( sys-devel/bc )"
PDEPEND="app-misc/ca-certificates"
+MULTILIB_WRAPPED_HEADERS=(
+ usr/include/openssl/rand.h
+ usr/include/openssl/modes.h
+ usr/include/openssl/seed.h
+ usr/include/openssl/opensslconf.h
+ usr/include/openssl/kssl.h
+ usr/include/openssl/opensslconf.h
+ usr/include/openssl/srtp.h
+ usr/include/openssl/ossl_typ.h
+ usr/include/openssl/sha.h
+)
+
src_unpack() {
unpack ${P}.tar.gz
SSL_CNF_DIR="/etc/ssl"
@@ -88,9 +104,10 @@
# The config script does stupid stuff to prompt the user. Kill it.
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
./config --test-sanity || die "I AM NOT SANE"
+ multilib_copy_sources
}
-src_configure() {
+multilib_src_configure() {
unset APPS #197996
unset SCRIPTS #312551
unset CROSS_COMPILE #311473
@@ -123,6 +140,7 @@
einfo "Use configuration ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
+ ECONF_SOURCE=${S} \
echoit \
./${config} \
${sslout} \
@@ -160,7 +178,7 @@
Makefile || die
}
-src_compile() {
+multilib_src_compile() {
# depend is needed to use $confopts; it also doesn't matter
# that it's -j1 as the code itself serializes subdirs
emake -j1 depend
@@ -170,12 +188,15 @@
emake rehash
}
-src_test() {
+multilib_src_test() {
emake -j1 test
}
-src_install() {
+multilib_src_install() {
emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
dobin "${WORKDIR}"/c_rehash #333117
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
dohtml -r doc/*