diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-09-01 07:00:11 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-09-01 07:00:11 +0000 |
| commit | 370e02768c6d7f9d7aee780f02aa01d89fbe2ffd (patch) | |
| tree | 6177f4720997d741d4a0a288e7f4d429732d0978 | |
| parent | tidy a bit (Manifest recommit) (diff) | |
| download | gentoo-2-370e02768c6d7f9d7aee780f02aa01d89fbe2ffd.tar.gz gentoo-2-370e02768c6d7f9d7aee780f02aa01d89fbe2ffd.tar.bz2 gentoo-2-370e02768c6d7f9d7aee780f02aa01d89fbe2ffd.zip | |
made openssl use $(get_libdir) to optionally install to lib64/lib32
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.7d-r1.ebuild | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 6c08d3a89d46..b33d33a7971b 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/openssl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.91 2004/07/19 19:08:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.92 2004/09/01 07:00:11 lv Exp $ + + 01 Sep 2004; Travis Tilley <lv@gentoo.org> openssl-0.9.7d-r1.ebuild: + made openssl use $(get_libdir) to optionally install to lib64/lib32 19 Jul 2004; Mike Frysinger <vapier@gentoo.org> openssl-0.9.7d-r1.ebuild: Move `make test` out of src_compile() and into src_test() where it should be. diff --git a/dev-libs/openssl/openssl-0.9.7d-r1.ebuild b/dev-libs/openssl/openssl-0.9.7d-r1.ebuild index 5e1616c9ae31..1fc5929be54c 100644 --- a/dev-libs/openssl/openssl-0.9.7d-r1.ebuild +++ b/dev-libs/openssl/openssl-0.9.7d-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d-r1.ebuild,v 1.9 2004/07/26 22:38:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d-r1.ebuild,v 1.10 2004/09/01 07:00:11 lv Exp $ inherit eutils flag-o-matic gcc @@ -92,6 +92,15 @@ src_unpack() { done IFS=$OLDIFS + if [ "$(get_libdir)" != "lib" ] ; then + # using a library directory other than lib requires some magic + sed -e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \ + -e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \ + Makefile.org > Makefile.new + mv Makefile.new Makefile.org + ./config --test-sanity || die + fi + # openssl-0.9.6 test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && { cd ${WORKDIR}/${OLD_096_P} @@ -249,7 +258,7 @@ src_install() { dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6|| die "libssl.so.0.9.6 not found" } - fperms a+x /usr/lib/pkgconfig #34088 + fperms a+x /usr/$(get_libdir)/pkgconfig #34088 } pkg_postinst() { |