| 1 |
vapier 11/10/31 20:21:25 |
| 2 |
|
| 3 |
Modified: ChangeLog openssl-0.9.8r.ebuild |
| 4 |
Log: |
| 5 |
Update to EAPI=2 to keep down differences with newer openssl ebuilds, and fix path to enginedir in multilib setup. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.409 dev-libs/openssl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.409&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.409&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.408&r2=1.409 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v |
| 19 |
retrieving revision 1.408 |
| 20 |
retrieving revision 1.409 |
| 21 |
diff -u -r1.408 -r1.409 |
| 22 |
--- ChangeLog 1 Oct 2011 07:28:54 -0000 1.408 |
| 23 |
+++ ChangeLog 31 Oct 2011 20:21:25 -0000 1.409 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-libs/openssl |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.408 2011/10/01 07:28:54 pva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.409 2011/10/31 20:21:25 vapier Exp $ |
| 29 |
+ |
| 30 |
+ 31 Oct 2011; Mike Frysinger <vapier@g.o> openssl-0.9.8r.ebuild: |
| 31 |
+ Update to EAPI=2 to keep down differences with newer openssl ebuilds, and fix |
| 32 |
+ path to enginedir in multilib setup. |
| 33 |
|
| 34 |
01 Oct 2011; Peter Volkov <pva@g.o> openssl-1.0.0e.ebuild: |
| 35 |
Install README.gost when USE=rfc3779, bug #385027. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.6 dev-libs/openssl/openssl-0.9.8r.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild?rev=1.6&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild?rev=1.6&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild?r1=1.5&r2=1.6 |
| 44 |
|
| 45 |
Index: openssl-0.9.8r.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild,v |
| 48 |
retrieving revision 1.5 |
| 49 |
retrieving revision 1.6 |
| 50 |
diff -u -r1.5 -r1.6 |
| 51 |
--- openssl-0.9.8r.ebuild 5 Jul 2011 07:01:57 -0000 1.5 |
| 52 |
+++ openssl-0.9.8r.ebuild 31 Oct 2011 20:21:25 -0000 1.6 |
| 53 |
@@ -1,10 +1,10 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild,v 1.5 2011/07/05 07:01:57 vapier Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild,v 1.6 2011/10/31 20:21:25 vapier Exp $ |
| 58 |
|
| 59 |
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat |
| 60 |
|
| 61 |
-EAPI="1" |
| 62 |
+EAPI="2" |
| 63 |
|
| 64 |
inherit eutils flag-o-matic toolchain-funcs |
| 65 |
|
| 66 |
@@ -34,10 +34,7 @@ |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
-src_unpack() { |
| 71 |
- unpack ${A} |
| 72 |
- cd "${S}" |
| 73 |
- |
| 74 |
+src_prepare() { |
| 75 |
epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch |
| 76 |
epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 |
| 77 |
epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130 |
| 78 |
@@ -56,6 +53,10 @@ |
| 79 |
|| die |
| 80 |
# show the actual commands in the log |
| 81 |
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 82 |
+ # update the enginedir path |
| 83 |
+ sed -i \ |
| 84 |
+ -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \ |
| 85 |
+ Configure || die |
| 86 |
|
| 87 |
# allow openssl to be cross-compiled |
| 88 |
cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" |
| 89 |
@@ -69,7 +70,7 @@ |
| 90 |
./config --test-sanity || die "I AM NOT SANE" |
| 91 |
} |
| 92 |
|
| 93 |
-src_compile() { |
| 94 |
+src_configure() { |
| 95 |
unset APPS #197996 |
| 96 |
unset SCRIPTS #312551 |
| 97 |
|
| 98 |
@@ -123,7 +124,9 @@ |
| 99 |
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
| 100 |
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
| 101 |
Makefile || die |
| 102 |
+} |
| 103 |
|
| 104 |
+src_compile() { |
| 105 |
# depend is needed to use $confopts |
| 106 |
emake -j1 depend || die "depend failed" |
| 107 |
emake -j1 build_libs || die "make build_libs failed" |
Archives