diff options
author | Fabian Groffen <grobian@gentoo.org> | 2013-08-14 20:22:30 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2013-08-14 20:22:30 +0000 |
commit | 4aa33b032c9efa6ed1454a2a3e9d628d5cdfe71a (patch) | |
tree | d37bfcbe517c767a962b629146692ddc77c4bff9 | |
parent | remove the mask for freerdp/libkfbapi, they are keyworded (diff) | |
download | gentoo-2-4aa33b032c9efa6ed1454a2a3e9d628d5cdfe71a.tar.gz gentoo-2-4aa33b032c9efa6ed1454a2a3e9d628d5cdfe71a.tar.bz2 gentoo-2-4aa33b032c9efa6ed1454a2a3e9d628d5cdfe71a.zip |
Fixed and marked for ~x64-macos, bug #479554
(Portage version: 2.2.01.22288-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
-rw-r--r-- | dev-libs/crypto++/ChangeLog | 5 | ||||
-rw-r--r-- | dev-libs/crypto++/crypto++-5.6.2.ebuild | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog index b77b98758346..d21d24197855 100644 --- a/dev-libs/crypto++/ChangeLog +++ b/dev-libs/crypto++/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/crypto++ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.85 2013/07/13 08:43:16 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.86 2013/08/14 20:22:30 grobian Exp $ + + 14 Aug 2013; Fabian Groffen <grobian@gentoo.org> crypto++-5.6.2.ebuild: + Fixed and marked for ~x64-macos, bug #479554 13 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> crypto++-5.6.2.ebuild: Add ~arm keyword, wrt bug #469294 diff --git a/dev-libs/crypto++/crypto++-5.6.2.ebuild b/dev-libs/crypto++/crypto++-5.6.2.ebuild index 8b929f63f126..2b3a0a4d0c87 100644 --- a/dev-libs/crypto++/crypto++-5.6.2.ebuild +++ b/dev-libs/crypto++/crypto++-5.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2.ebuild,v 1.9 2013/07/13 08:43:16 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2.ebuild,v 1.10 2013/08/14 20:22:30 grobian Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x64-macos" IUSE="static-libs" DEPEND="app-arch/unzip @@ -22,14 +22,23 @@ S=${WORKDIR} src_prepare() { epatch "${FILESDIR}"/${P}-make.patch + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i \ + -e '/^LIBTOOL =/s/= /= g/' \ + -e 's/libcrypto++\.so\.0\.0\.0/libcrypto++.0.0.0.dylib/' \ + -e 's/libcryptopp\.so\([\.0]\+\)\?/libcryptopp\1.dylib/' \ + GNUmakefile || die # 479554 + fi } src_compile() { # higher optimizations cause problems replace-flags -O? -O1 filter-flags -fomit-frame-pointer + # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS + [[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM - emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" + emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" } src_test() { @@ -47,6 +56,6 @@ src_test() { } src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} } |