diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-11-04 18:51:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-11-04 18:51:34 +0000 |
| commit | d226237b479527368909cdceaf2e21f4e6f85c94 (patch) | |
| tree | 23f6bcfde20e04f32c286657f2eed739573ded2e /dev-libs/crypto++ | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d226237b479527368909cdceaf2e21f4e6f85c94.tar.gz gentoo-2-d226237b479527368909cdceaf2e21f4e6f85c94.tar.bz2 gentoo-2-d226237b479527368909cdceaf2e21f4e6f85c94.zip | |
Fix building on HPPA (bug #343909). Wrap long lines. Replace spaces with tabs.
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'dev-libs/crypto++')
| -rw-r--r-- | dev-libs/crypto++/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/crypto++/crypto++-5.6.1.ebuild | 17 | ||||
| -rw-r--r-- | dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch | 19 |
3 files changed, 35 insertions, 8 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog index c56f2e789149..f94d11ecdb07 100644 --- a/dev-libs/crypto++/ChangeLog +++ b/dev-libs/crypto++/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/crypto++ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.60 2010/11/04 12:38:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.61 2010/11/04 18:51:34 jer Exp $ + + 04 Nov 2010; Jeroen Roovers <jer@gentoo.org> crypto++-5.6.1.ebuild, + +files/crypto++-5.6.1-sunos.patch: + Fix building on HPPA (bug #343909). Wrap long lines. Replace spaces with + tabs. 04 Nov 2010; Markus Meier <maekke@gentoo.org> crypto++-5.6.1.ebuild: x86 stable, bug #343373 diff --git a/dev-libs/crypto++/crypto++-5.6.1.ebuild b/dev-libs/crypto++/crypto++-5.6.1.ebuild index 2e68e35b2850..e41a93c3a2ef 100644 --- a/dev-libs/crypto++/crypto++-5.6.1.ebuild +++ b/dev-libs/crypto++/crypto++-5.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1.ebuild,v 1.2 2010/11/04 12:38:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1.ebuild,v 1.3 2010/11/04 18:51:34 jer Exp $ EAPI="3" @@ -21,7 +21,8 @@ RDEPEND="" S="${WORKDIR}" src_prepare() { - epatch "${FILESDIR}/${P}-fix_build_system.patch" + epatch "${FILESDIR}/${P}-fix_build_system.patch" \ + "${FILESDIR}/${P}-sunos.patch" } src_compile() { @@ -30,7 +31,8 @@ src_compile() { filter-flags -fomit-frame-pointer use amd64 && append-flags -DCRYPTOPP_DISABLE_ASM - emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" || die "emake failed" + emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \ + LIBDIR="$(get_libdir)" || die "emake failed" } src_test() { @@ -41,12 +43,13 @@ src_test() { done if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test; then - eerror "Crypto++ self-tests failed." - eerror "Try to remove some optimization flags and reemerge Crypto++." - die "emake test failed" + eerror "Crypto++ self-tests failed." + eerror "Try to remove some optimization flags and reemerge Crypto++." + die "emake test failed" fi } src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "emake install failed" + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install \ + || die "emake install failed" } diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch b/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch new file mode 100644 index 000000000000..eb3f18e62da6 --- /dev/null +++ b/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch @@ -0,0 +1,19 @@ +--- GNUmakefile.orig 2010-11-04 18:18:03.000000000 +0100 ++++ GNUmakefile 2010-11-04 19:21:29.000000000 +0100 +@@ -102,8 +102,6 @@ + ifeq ($(UNAME),SunOS) + LDLIBS += -lnsl -lsocket + M32OR64 = -m$(shell isainfo -b) +-endif +- + ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler + CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64) + LDFLAGS = +@@ -117,6 +115,7 @@ + CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC + endif + endif ++endif + + SRCS = $(wildcard *.cpp) + ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77 |