diff options
| author |   Zack Welch <zwelch@gentoo.org> | 2003-02-25 18:34:56 +0000 |
|---|---|---|
| committer | Zack Welch <zwelch@gentoo.org> | 2003-02-25 18:34:56 +0000 |
| commit | cc3517e0f4eaad5e123d623311e6a31e0c831035 (patch) | |
| tree | 0ba39176d5ab744396f3dfb1de4a2aeafd271056 /dev-libs/openssl | |
| parent | new version fixing also some of the problems in #12197 but see changelog and ... (diff) | |
| download | gentoo-2-cc3517e0f4eaad5e123d623311e6a31e0c831035.tar.gz gentoo-2-cc3517e0f4eaad5e123d623311e6a31e0c831035.tar.bz2 gentoo-2-cc3517e0f4eaad5e123d623311e6a31e0c831035.zip | |
add patch to openssl to fix apps that link against it (ARM only)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.6i.ebuild | 27 |
2 files changed, 22 insertions, 12 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 5a145f17385a..99538710f49b 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for dev-libs/openssl # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.28 2003/02/22 00:35:21 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.29 2003/02/25 18:34:56 zwelch Exp $ + + 23 Feb 2003; Zach Welch <zwelch@gentoo.org> openssl-0.9.6i.ebuild : + Add arm patch to ebuild to fix problems linking aginst libcrypto.so + Cleanup several lintool violations 21 Feb 2003; Zach Welch <zwelch@gentoo.org> openssl-0.9.6i.ebuild : Added arm to keywords. - Added -fPIC to CFLAGS for arm needed by many apps linking to openssl. 21 Feb 2003; Jan Seidel <tuxus@gentoo.org> openssl-0.9.6g-r1.ebuild openssl-0.9.6i.ebuild : added a patch for mips diff --git a/dev-libs/openssl/openssl-0.9.6i.ebuild b/dev-libs/openssl/openssl-0.9.6i.ebuild index 5fefa32d5096..f803b00aaf9f 100644 --- a/dev-libs/openssl/openssl-0.9.6i.ebuild +++ b/dev-libs/openssl/openssl-0.9.6i.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6i.ebuild,v 1.3 2003/02/22 00:35:21 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6i.ebuild,v 1.4 2003/02/25 18:34:56 zwelch Exp $ + +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" @@ -18,20 +20,25 @@ src_unpack() { patch -p1 < ${FILESDIR}/${PF}-gentoo.diff - if [ "${ARCH}" = "mips" ] - then - cd ${S} - patch -p1 < ${FILESDIR}/openssl-0.9.6-mips.diff || die - fi + if [ "${ARCH}" = "mips" ] + then + cd ${S} + patch -p1 < ${FILESDIR}/openssl-0.9.6-mips.diff || die + fi # many apps linking to openssl needs -fPIC - if [ "${ARCH}" = "hppa" -o "${ARCH}" = "arm" ] + if [ "${ARCH}" = "hppa" ] then CFLAGS="${CFLAGS} -fPIC" fi - - - cp Configure Configure.orig + if [ "${ARCH}" = "arm" ]; then + # patch linker to add -ldl or things linking aginst libcrypto fail + sed -e \ + 's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \ + Configure > Configure.orig + else + cp Configure Configure.orig + fi sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure } |