diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-02-15 06:21:01 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-02-15 06:21:01 +0000 |
| commit | 862844076a454da563b29642a2131382a5f68452 (patch) | |
| tree | 7603e2d9d3386c950e7d338617965c5eaaf6fe1f /dev-lang/mercury | |
| parent | s390/sh stable (diff) | |
| download | gentoo-2-862844076a454da563b29642a2131382a5f68452.tar.gz gentoo-2-862844076a454da563b29642a2131382a5f68452.tar.bz2 gentoo-2-862844076a454da563b29642a2131382a5f68452.zip | |
gcc atomic ops fix; die on subdir mmake failure
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch | 11 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch | 16 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04_beta1.ebuild | 4 |
4 files changed, 36 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 8c62cf261537..1e11fa549fa6 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.97 2010/02/14 07:24:57 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.98 2010/02/15 06:21:01 keri Exp $ + + 15 Feb 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild, + +files/mercury-10.04_beta1-atomic-ops.patch, + +files/mercury-10.04_beta1-tests-subdir.patch: + gcc atomic ops fix; die on subdir mmake failure 14 Feb 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild, +files/mercury-10.04_beta1-boehm_gc.patch: diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch b/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch new file mode 100644 index 000000000000..a5e9c0c20bec --- /dev/null +++ b/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch @@ -0,0 +1,11 @@ +--- mercury-compiler-10.04-beta.orig/runtime/mercury_atomic_ops.h 2010-01-10 17:53:39.000000000 +1300 ++++ mercury-compiler-10.04-beta/runtime/mercury_atomic_ops.h 2010-02-14 20:40:45.000000000 +1300 +@@ -310,7 +310,7 @@ + + #define MR_ATOMIC_DEC_INT_AND_IS_ZERO_BODY \ + do { \ +- is_zero = __sync_sub_and_fetch(addr, 1) == 0; \ ++ return (MR_bool)(__sync_sub_and_fetch(addr, 1) == 0); \ + } while (0) + + #endif diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch b/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch new file mode 100644 index 000000000000..930c1a1bfb3a --- /dev/null +++ b/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch @@ -0,0 +1,16 @@ +--- mercury-tests-10.04-beta.orig/Mmake.common 2009-08-14 15:21:53.000000000 +1200 ++++ mercury-tests-10.04-beta/Mmake.common 2010-02-15 19:09:51.000000000 +1300 +@@ -379,12 +379,7 @@ + + .PHONY: $(RUNTESTS_IN_SUBDIRS) + $(RUNTESTS_IN_SUBDIRS): runtests_in_%: +- +if (cd $* && mmake runtests) ; then \ +- true ; \ +- else \ +- echo Could not run tests in directory $* ; \ +- echo Could not run tests in directory $* >> NOMAKE_DIRS ; \ +- fi ++ +cd $* && mmake runtests + + realclean_subdirs: + +succeeded=true; \ diff --git a/dev-lang/mercury/mercury-10.04_beta1.ebuild b/dev-lang/mercury/mercury-10.04_beta1.ebuild index 2aa91c9db3ff..bfb37a39e6a0 100644 --- a/dev-lang/mercury/mercury-10.04_beta1.ebuild +++ b/dev-lang/mercury/mercury-10.04_beta1.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-lang/mercury/mercury-10.04_beta1.ebuild,v 1.2 2010/02/14 07:24:57 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.3 2010/02/15 06:21:01 keri Exp $ inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib @@ -36,6 +36,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-multilib.patch epatch "${FILESDIR}"/${P}-boehm_gc.patch + epatch "${FILESDIR}"/${P}-atomic-ops.patch epatch "${FILESDIR}"/${P}-docs.patch epatch "${FILESDIR}"/${P}-no-reconf.patch @@ -45,6 +46,7 @@ src_unpack() { if use test; then epatch "${FILESDIR}"/${P}-tests-workspace.patch + epatch "${FILESDIR}"/${P}-tests-subdir.patch fi } |