diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-01-11 00:45:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-11 00:45:44 +0000 |
| commit | 52557ac1ef854e585b084585ad45bb7286dfc438 (patch) | |
| tree | 216127bdfe376685614860b2d835477006fe7676 | |
| parent | Fixing missing documentation, bug #299472 (diff) | |
| download | gentoo-2-52557ac1ef854e585b084585ad45bb7286dfc438.tar.gz gentoo-2-52557ac1ef854e585b084585ad45bb7286dfc438.tar.bz2 gentoo-2-52557ac1ef854e585b084585ad45bb7286dfc438.zip | |
Link in gmp when USE=gmp #276557 by Justin Lecher.
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch | 17 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8l-r2.ebuild | 6 |
3 files changed, 17 insertions, 13 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 5eea830c50ce..ce92c895768c 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/openssl -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.309 2009/11/27 22:00:12 vapier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.310 2010/01/11 00:45:43 vapier Exp $ + + 11 Jan 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8l-r2.ebuild: + Link in gmp when USE=gmp #276557 by Justin Lecher. *openssl-0.9.8l-r2 (27 Nov 2009) diff --git a/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch b/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch index e96e906558b7..a798164a9069 100644 --- a/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch +++ b/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch @@ -1,18 +1,19 @@ -diff -ur a/Configure b/Configure ---- a/Configure 2006-11-30 14:01:38 +0000 -+++ b/Configure 2007-10-01 11:18:33 +0100 +--- a/Configure ++++ b/Configure @@ -365,7 +365,7 @@ # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it # simply *happens* to work around a compiler bug in gcc 3.3.3, # triggered by RIPEMD160 code. --"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -diff -ur a/crypto/des/Makefile b/crypto/des/Makefile ---- a/crypto/des/Makefile 2006-02-04 01:48:56 +0000 -+++ b/crypto/des/Makefile 2007-10-01 11:45:53 +0100 + +the -B flag is a no-op nowadays + +--- a/crypto/des/Makefile ++++ b/crypto/des/Makefile @@ -62,7 +62,7 @@ $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) diff --git a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild b/dev-libs/openssl/openssl-0.9.8l-r2.ebuild index bdc263488c0a..e370c5041bf4 100644 --- a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild +++ b/dev-libs/openssl/openssl-0.9.8l-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.1 2009/11/27 22:00:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.2 2010/01/11 00:45:43 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -104,7 +104,7 @@ src_compile() { enable-mdc2 \ $(use_ssl !bindist rc5) \ enable-tlsext \ - $(use_ssl gmp) \ + $(use_ssl gmp gmp -lgmp) \ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ $(use_ssl zlib) \ --prefix=/usr \ |