Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488418 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/dev-libs/openssl/openssl-1.0.1e-r3.ebuild (-10 / +36 lines)
Lines 4-10 Link Here
4
4
5
EAPI="4"
5
EAPI="4"
6
6
7
inherit eutils flag-o-matic toolchain-funcs multilib
7
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
8
8
9
REV="1.7"
9
REV="1.7"
10
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
10
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
Lines 19-32 Link Here
19
19
20
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
20
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
21
# our libssl.a depends on libz.a/etc... at runtime.
21
# our libssl.a depends on libz.a/etc... at runtime.
22
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
22
LIB_DEPEND_STATIC="gmp? ( dev-libs/gmp[static-libs(+),abi_x86_32(-)] )
23
	zlib? ( sys-libs/zlib[static-libs(+)] )
23
	zlib? ( sys-libs/zlib[static-libs(+),abi_x86_32(-)] )
24
	kerberos? ( app-crypt/mit-krb5 )"
24
	kerberos? ( app-crypt/mit-krb5[abi_x86_32(-)] )"
25
LIB_DEPEND_NONSTATIC="
26
	gmp? ( dev-libs/gmp[abi_x86_32(-)] )
27
	zlib? ( sys-libs/zlib[abi_x86_32(-)] )
28
	kerberos? ( app-crypt/mit-krb5[abi_x86_32(-)] )
29
"
25
# The blocks are temporary just to make sure people upgrade to a
30
# The blocks are temporary just to make sure people upgrade to a
26
# version that lack runtime version checking.  We'll drop them in
31
# version that lack runtime version checking.  We'll drop them in
27
# the future.
32
# the future.
28
RDEPEND="static-libs? ( ${LIB_DEPEND} )
33
RDEPEND="static-libs? ( ${LIB_DEPEND_STATIC} )
29
	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
34
	abi_x86_32? (
35
		!<=app-emulation/emul-linux-x86-baselibs-20131008-r5
36
		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
37
	)
38
	!static-libs? ( ${LIB_DEPEND_NONSTATIC} )
30
	!<net-misc/openssh-5.9_p1-r4
39
	!<net-misc/openssh-5.9_p1-r4
31
	!<net-libs/neon-0.29.6-r1"
40
	!<net-libs/neon-0.29.6-r1"
32
DEPEND="${RDEPEND}
41
DEPEND="${RDEPEND}
Lines 35-40 Link Here
35
	test? ( sys-devel/bc )"
44
	test? ( sys-devel/bc )"
36
PDEPEND="app-misc/ca-certificates"
45
PDEPEND="app-misc/ca-certificates"
37
46
47
MULTILIB_WRAPPED_HEADERS=(
48
	usr/include/openssl/rand.h
49
	usr/include/openssl/modes.h
50
	usr/include/openssl/seed.h
51
	usr/include/openssl/opensslconf.h
52
	usr/include/openssl/kssl.h
53
	usr/include/openssl/opensslconf.h
54
	usr/include/openssl/srtp.h
55
	usr/include/openssl/ossl_typ.h
56
	usr/include/openssl/sha.h
57
)
58
38
src_unpack() {
59
src_unpack() {
39
	unpack ${P}.tar.gz
60
	unpack ${P}.tar.gz
40
	SSL_CNF_DIR="/etc/ssl"
61
	SSL_CNF_DIR="/etc/ssl"
Lines 91-99 Link Here
91
	# The config script does stupid stuff to prompt the user.  Kill it.
112
	# The config script does stupid stuff to prompt the user.  Kill it.
92
	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
113
	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
93
	./config --test-sanity || die "I AM NOT SANE"
114
	./config --test-sanity || die "I AM NOT SANE"
115
	multilib_copy_sources
94
}
116
}
95
117
96
src_configure() {
118
multilib_src_configure() {
97
	unset APPS #197996
119
	unset APPS #197996
98
	unset SCRIPTS #312551
120
	unset SCRIPTS #312551
99
	unset CROSS_COMPILE #311473
121
	unset CROSS_COMPILE #311473
Lines 127-132 Link Here
127
	einfo "Use configuration ${sslout:-(openssl knows best)}"
149
	einfo "Use configuration ${sslout:-(openssl knows best)}"
128
	local config="Configure"
150
	local config="Configure"
129
	[[ -z ${sslout} ]] && config="config"
151
	[[ -z ${sslout} ]] && config="config"
152
	ECONF_SOURCE=${S} \
130
	echoit \
153
	echoit \
131
	./${config} \
154
	./${config} \
132
		${sslout} \
155
		${sslout} \
Lines 164-170 Link Here
164
		Makefile || die
187
		Makefile || die
165
}
188
}
166
189
167
src_compile() {
190
multilib_src_compile() {
168
	# depend is needed to use $confopts; it also doesn't matter
191
	# depend is needed to use $confopts; it also doesn't matter
169
	# that it's -j1 as the code itself serializes subdirs
192
	# that it's -j1 as the code itself serializes subdirs
170
	emake -j1 depend
193
	emake -j1 depend
Lines 174-185 Link Here
174
	emake rehash
197
	emake rehash
175
}
198
}
176
199
177
src_test() {
200
multilib_src_test() {
178
	emake -j1 test
201
	emake -j1 test
179
}
202
}
180
203
181
src_install() {
204
multilib_src_install() {
182
	emake INSTALL_PREFIX="${D}" install
205
	emake INSTALL_PREFIX="${D}" install
206
}
207
208
multilib_src_install_all() {
183
	dobin "${WORKDIR}"/c_rehash #333117
209
	dobin "${WORKDIR}"/c_rehash #333117
184
	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
210
	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
185
	dohtml -r doc/*
211
	dohtml -r doc/*

Return to bug 488418