diff options
| author |   Benjamin Smee <strerror@gentoo.org> | 2005-12-07 17:05:50 +0000 |
|---|---|---|
| committer | Benjamin Smee <strerror@gentoo.org> | 2005-12-07 17:05:50 +0000 |
| commit | 65079aee39db84273540c1b1976d39f75b8d8e03 (patch) | |
| tree | 47ac4499115f41f05823aae2418410244cb1205d /dev-libs/cyrus-sasl | |
| parent | version bump thanks to: Benno Schulenberg in bug #113084 (diff) | |
| download | gentoo-2-65079aee39db84273540c1b1976d39f75b8d8e03.tar.gz gentoo-2-65079aee39db84273540c1b1976d39f75b8d8e03.tar.bz2 gentoo-2-65079aee39db84273540c1b1976d39f75b8d8e03.zip | |
changes for bug #110066 and bug #114719
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-libs/cyrus-sasl')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild | 20 |
2 files changed, 9 insertions, 17 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 44f6ba77a106..032a6adb4c86 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.134 2005/11/30 00:39:42 strerror Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.135 2005/12/07 17:05:50 strerror Exp $ + + 07 Dec 2005; Benjamin Smee <strerror@gentoo.org> + cyrus-sasl-2.1.21-r2.ebuild: + changes for bug #110066 and bug #114719 *cyrus-sasl-2.1.21-r2 (30 Nov 2005) diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild index 306fb2abaa23..f7e8992fc383 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild,v 1.1 2005/11/30 00:39:42 strerror Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild,v 1.2 2005/12/07 17:05:50 strerror Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib @@ -171,21 +171,9 @@ src_compile() { # Upstream doesn't even honor their own configure options... grumble sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile - # Fix PEBCAK in make.conf. Bug #75538. - CFLAGS="$(echo ${CFLAGS} | xargs)" - CXXFLAGS="$(echo ${CXXFLAGS} | xargs)" - LDFLAGS="$(echo ${LDFLAGS} | xargs)" - - # Parallel build doesn't work. - # Parallel build doesn't like distcc/ccache? Bug #78643. - if has distcc $FEATURES || has ccache $FEATURES; then - einfo "You have \"distcc\" or \"ccache\" enabled" - einfo "build with MAKEOPTS=-j1" - emake -j1 || die "compile problem" - else - einfo "build with MAKEOPTS=$MAKEOPTS" - emake || die "compile problem" - fi + einfo "build with MAKEOPTS=$MAKEOPTS" + # we force -j1 for bug #110066 + emake -j1 || die "compile problem" # Bug #60769. Default location for java classes breaks OpenOffice. # Thanks to axxo@gentoo.org for the solution. |