Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 367068 Details for
Bug 488418
dev-libs/openssl - Add gx86-multilib support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
openssl-1.0.1e-r3.ebuild.patch
patch (text/plain), 3.09 KB, created by
Kent Fredric (IRC: kent\n) (RETIRED)
on 2014-01-05 12:22:08 UTC
(
hide
)
Description:
openssl-1.0.1e-r3.ebuild.patch
Filename:
MIME Type:
Creator:
Kent Fredric (IRC: kent\n) (RETIRED)
Created:
2014-01-05 12:22:08 UTC
Size:
3.09 KB
patch
obsolete
>--- /usr/portage/dev-libs/openssl/openssl-1.0.1e-r3.ebuild 2013-12-20 19:26:59.000000000 +0000 >+++ ./openssl-1.0.1e-r3.ebuild 2014-01-05 12:17:36.782175168 +0000 >@@ -4,7 +4,7 @@ > > 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)" >@@ -19,14 +19,23 @@ > > # Have the sub-libs in RDEPEND with [static-libs] since, logically, > # our libssl.a depends on libz.a/etc... at runtime. >-LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] ) >- zlib? ( sys-libs/zlib[static-libs(+)] ) >- kerberos? ( app-crypt/mit-krb5 )" >+LIB_DEPEND_STATIC="gmp? ( dev-libs/gmp[static-libs(+),abi_x86_32(-)] ) >+ zlib? ( sys-libs/zlib[static-libs(+),abi_x86_32(-)] ) >+ kerberos? ( app-crypt/mit-krb5[abi_x86_32(-)] )" >+LIB_DEPEND_NONSTATIC=" >+ gmp? ( dev-libs/gmp[abi_x86_32(-)] ) >+ zlib? ( sys-libs/zlib[abi_x86_32(-)] ) >+ kerberos? ( app-crypt/mit-krb5[abi_x86_32(-)] ) >+" > # The blocks are temporary just to make sure people upgrade to a > # version that lack runtime version checking. We'll drop them in > # the future. >-RDEPEND="static-libs? ( ${LIB_DEPEND} ) >- !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) >+RDEPEND="static-libs? ( ${LIB_DEPEND_STATIC} ) >+ abi_x86_32? ( >+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r5 >+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] >+ ) >+ !static-libs? ( ${LIB_DEPEND_NONSTATIC} ) > !<net-misc/openssh-5.9_p1-r4 > !<net-libs/neon-0.29.6-r1" > DEPEND="${RDEPEND} >@@ -35,6 +44,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" >@@ -91,9 +112,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 >@@ -127,6 +149,7 @@ > einfo "Use configuration ${sslout:-(openssl knows best)}" > local config="Configure" > [[ -z ${sslout} ]] && config="config" >+ ECONF_SOURCE=${S} \ > echoit \ > ./${config} \ > ${sslout} \ >@@ -164,7 +187,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 >@@ -174,12 +197,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/*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 488418
:
361152
|
361154
|
361156
| 367068 |
367086
|
376318