diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-07-09 18:00:57 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-07-09 18:00:57 +0000 |
| commit | 48754fe46f55780d468872283a6115d20aa7399e (patch) | |
| tree | 3f62ec56a13cf253383c45ff7963d3a216d6921a | |
| parent | dev-libs/libsigc++: don't build tests, they are not --as-needed safe (see bug... (diff) | |
| download | gentoo-2-48754fe46f55780d468872283a6115d20aa7399e.tar.gz gentoo-2-48754fe46f55780d468872283a6115d20aa7399e.tar.bz2 gentoo-2-48754fe46f55780d468872283a6115d20aa7399e.zip | |
Update patch for sparc-fbsd, bug 231243.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 i686)
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch | 11 |
3 files changed, 18 insertions, 3 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index a440df8cc674..e9c61a440efd 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.207 2008/06/04 12:28:46 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.208 2008/07/09 18:00:56 ulm Exp $ + + 09 Jul 2008; Ulrich Mueller <ulm@gentoo.org> + +files/emacs-cvs-freebsd-sparc-1.patch, emacs-cvs-23.0.9999.ebuild: + Update patch for sparc-fbsd, bug 231243. 04 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild, emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild: diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index b1777a1f39d0..de866c200c10 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.6 2008/06/04 12:28:46 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.7 2008/07/09 18:00:56 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -85,7 +85,7 @@ src_unpack() { || die "Upstream version number changed to ${FULL_VERSION}" echo - epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + epatch "${FILESDIR}/${PN}-freebsd-sparc-1.patch" sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch new file mode 100644 index 000000000000..85ff3a088784 --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch @@ -0,0 +1,11 @@ +--- emacs-orig/src/alloc.c 2008-07-09 19:33:18.000000000 +0200 ++++ emacs/src/alloc.c 2008-07-09 19:39:48.000000000 +0200 +@@ -4487,7 +4487,7 @@ + /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is + needed on ia64 too. See mach_dep.c, where it also says inline + assembler doesn't work with relevant proprietary compilers. */ +-#ifdef __sparc__ ++#if defined(__sparc__) && !defined(__FreeBSD__) + asm ("ta 3"); + #endif + |