public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild
@ 2010-07-24  0:05 Keri Harris (keri)
  0 siblings, 0 replies; 5+ messages in thread
From: Keri Harris (keri) @ 2010-07-24  0:05 UTC (permalink / raw
  To: gentoo-commits

keri        10/07/24 00:05:32

  Modified:             ChangeLog mercury-10.04.ebuild
  Log:
  Update hlc grade testsuites for MR_sprintf_float fix
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.107                dev-lang/mercury/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.106&r2=1.107

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ChangeLog	22 Jul 2010 07:01:16 -0000	1.106
+++ ChangeLog	24 Jul 2010 00:05:31 -0000	1.107
@@ -1,6 +1,10 @@
 # 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.106 2010/07/22 07:01:16 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.107 2010/07/24 00:05:31 keri Exp $
+
+  24 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-tests-mercury-float.patch:
+  Update hlc grade testsuites for MR_sprintf_float fix
 
   22 Jul 2010; <keri@gentoo.org> +files/50mercury-gentoo.el:
   Add mercury site-lisp configuration



1.2                  dev-lang/mercury/mercury-10.04.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.1&r2=1.2

Index: mercury-10.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercury-10.04.ebuild	19 Jul 2010 09:25:31 -0000	1.1
+++ mercury-10.04.ebuild	24 Jul 2010 00:05:32 -0000	1.2
@@ -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.ebuild,v 1.1 2010/07/19 09:25:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.2 2010/07/24 00:05:32 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -46,6 +46,7 @@
 	if use test; then
 		epatch "${FILESDIR}"/${P}-tests-workspace.patch
 		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
+		epatch "${FILESDIR}"/${P}-tests-mercury-float.patch
 	fi
 }
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild
@ 2010-07-25  8:45 Keri Harris (keri)
  0 siblings, 0 replies; 5+ messages in thread
From: Keri Harris (keri) @ 2010-07-25  8:45 UTC (permalink / raw
  To: gentoo-commits

keri        10/07/25 08:45:24

  Modified:             ChangeLog mercury-10.04.ebuild
  Log:
  Compile libgrades after default llds grade in case default llds grade != default grade (used in testsuite)
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.109                dev-lang/mercury/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.108&r2=1.109

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog	24 Jul 2010 02:29:17 -0000	1.108
+++ ChangeLog	25 Jul 2010 08:45:23 -0000	1.109
@@ -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.108 2010/07/24 02:29:17 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.109 2010/07/25 08:45:23 keri Exp $
+
+  25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-libgrades.patch:
+  Compile libgrades after default llds grade in case default llds grade !=
+  default grade (used in testsuite)
 
   24 Jul 2010; <keri@gentoo.org> files/mercury-10.04-boehm_gc.patch:
   Update generic mach_dep for ASM_CLEAR_CODE targets



1.3                  dev-lang/mercury/mercury-10.04.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.2&r2=1.3

Index: mercury-10.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mercury-10.04.ebuild	24 Jul 2010 00:05:32 -0000	1.2
+++ mercury-10.04.ebuild	25 Jul 2010 08:45:23 -0000	1.3
@@ -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.ebuild,v 1.2 2010/07/24 00:05:32 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.3 2010/07/25 08:45:23 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -35,6 +35,7 @@
 	unpack ${A}
 
 	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch
@@ -73,11 +74,25 @@
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \
 		|| die "emake failed"
+
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		libgrades || die "emake libgrades failed"
 }
 
 src_test() {
 	TEST_GRADE=`scripts/ml --print-grade`
-	TWS="${S}"
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp browser/mer_browser.init "${TWS}"/browser/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
+	else
+		TWS="${S}"
+	fi
 
 	cd "${TESTDIR}"
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
@@ -126,7 +141,7 @@
 	fi
 
 	if use java; then
-		dodoc README.java
+		dodoc README.Java
 	fi
 }
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild
@ 2010-07-25 18:51 Keri Harris (keri)
  0 siblings, 0 replies; 5+ messages in thread
From: Keri Harris (keri) @ 2010-07-25 18:51 UTC (permalink / raw
  To: gentoo-commits

keri        10/07/25 18:51:57

  Modified:             ChangeLog mercury-10.04.ebuild
  Log:
  Compile default-grade after default llds grade in case default llds grade != default grade (used in testsuite)
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.110                dev-lang/mercury/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.109&r2=1.110

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog	25 Jul 2010 08:45:23 -0000	1.109
+++ ChangeLog	25 Jul 2010 18:51:57 -0000	1.110
@@ -1,6 +1,13 @@
 # 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.109 2010/07/25 08:45:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.110 2010/07/25 18:51:57 keri Exp $
+
+  25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-default-grade.patch,
+  -files/mercury-10.04-libgrades.patch:
+  Compile default-grade after default llds grade in case default llds grade
+  != default grade (used in testsuite). Only default-grade and default llds
+  grade are needed prior to running src_test() and src_install().
 
   25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   +files/mercury-10.04-libgrades.patch:



1.4                  dev-lang/mercury/mercury-10.04.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.3&r2=1.4

Index: mercury-10.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mercury-10.04.ebuild	25 Jul 2010 08:45:23 -0000	1.3
+++ mercury-10.04.ebuild	25 Jul 2010 18:51:57 -0000	1.4
@@ -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.ebuild,v 1.3 2010/07/25 08:45:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.4 2010/07/25 18:51:57 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -35,7 +35,7 @@
 	unpack ${A}
 
 	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-default-grade.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch
@@ -79,7 +79,7 @@
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		libgrades || die "emake libgrades failed"
+		default_grade || die "emake default_grade failed"
 }
 
 src_test() {






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild
@ 2010-07-26  7:30 Keri Harris (keri)
  0 siblings, 0 replies; 5+ messages in thread
From: Keri Harris (keri) @ 2010-07-26  7:30 UTC (permalink / raw
  To: gentoo-commits

keri        10/07/26 07:30:20

  Modified:             ChangeLog mercury-10.04.ebuild
  Log:
  Specify llds-base-grade for sparc
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.111                dev-lang/mercury/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.110&r2=1.111

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog	25 Jul 2010 18:51:57 -0000	1.110
+++ ChangeLog	26 Jul 2010 07:30:19 -0000	1.111
@@ -1,6 +1,10 @@
 # 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.110 2010/07/25 18:51:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.111 2010/07/26 07:30:19 keri Exp $
+
+  26 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-sparc-llds-base-grade.patch:
+  Specify llds-base-grade for sparc
 
   25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   +files/mercury-10.04-default-grade.patch,



1.5                  dev-lang/mercury/mercury-10.04.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.4&r2=1.5

Index: mercury-10.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mercury-10.04.ebuild	25 Jul 2010 18:51:57 -0000	1.4
+++ mercury-10.04.ebuild	26 Jul 2010 07:30:20 -0000	1.5
@@ -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.ebuild,v 1.4 2010/07/25 18:51:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.5 2010/07/26 07:30:20 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -36,6 +36,7 @@
 
 	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-default-grade.patch
+	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild
@ 2010-07-28  8:24 Keri Harris (keri)
  0 siblings, 0 replies; 5+ messages in thread
From: Keri Harris (keri) @ 2010-07-28  8:24 UTC (permalink / raw
  To: gentoo-commits

keri        10/07/28 08:24:55

  Modified:             ChangeLog mercury-10.04.ebuild
  Log:
  Disable hard-coded static link tests
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.112                dev-lang/mercury/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.111&r2=1.112

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog	26 Jul 2010 07:30:19 -0000	1.111
+++ ChangeLog	28 Jul 2010 08:24:55 -0000	1.112
@@ -1,6 +1,10 @@
 # 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.111 2010/07/26 07:30:19 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.112 2010/07/28 08:24:55 keri Exp $
+
+  28 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-tests-static-link.patch:
+  Disable hard-coded static link tests
 
   26 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   +files/mercury-10.04-sparc-llds-base-grade.patch:



1.6                  dev-lang/mercury/mercury-10.04.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.5&r2=1.6

Index: mercury-10.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercury-10.04.ebuild	26 Jul 2010 07:30:20 -0000	1.5
+++ mercury-10.04.ebuild	28 Jul 2010 08:24:55 -0000	1.6
@@ -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.ebuild,v 1.5 2010/07/26 07:30:20 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.6 2010/07/28 08:24:55 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -49,6 +49,7 @@
 		epatch "${FILESDIR}"/${P}-tests-workspace.patch
 		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
 		epatch "${FILESDIR}"/${P}-tests-mercury-float.patch
+		epatch "${FILESDIR}"/${P}-tests-static-link.patch
 	fi
 }
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-07-28  8:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-25 18:51 [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04.ebuild Keri Harris (keri)
  -- strict thread matches above, loose matches on Subject: below --
2010-07-28  8:24 Keri Harris (keri)
2010-07-26  7:30 Keri Harris (keri)
2010-07-25  8:45 Keri Harris (keri)
2010-07-24  0:05 Keri Harris (keri)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox