* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-11.07_beta1.ebuild
@ 2011-06-30 7:53 Keri Harris (keri)
0 siblings, 0 replies; 3+ messages in thread
From: Keri Harris (keri) @ 2011-06-30 7:53 UTC (permalink / raw
To: gentoo-commits
keri 11/06/30 07:53:16
Modified: ChangeLog
Added: mercury-11.07_beta1.ebuild
Log:
Version bump
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Revision Changes Path
1.140 dev-lang/mercury/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.139&r2=1.140
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog 29 Jun 2011 19:10:21 -0000 1.139
+++ ChangeLog 30 Jun 2011 07:53:16 -0000 1.140
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.139 2011/06/29 19:10:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.140 2011/06/30 07:53:16 keri Exp $
+
+*mercury-11.07_beta1 (30 Jun 2011)
+
+ 30 Jun 2011; <keri@gentoo.org> +mercury-11.07_beta1.ebuild:
+ Version bump
29 Jun 2011; Markus Meier <maekke@gentoo.org> mercury-11.01.ebuild:
x86 stable, bug #371557
1.1 dev-lang/mercury/mercury-11.07_beta1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild?rev=1.1&content-type=text/plain
Index: mercury-11.07_beta1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild,v 1.1 2011/06/30 07:53:16 keri Exp $
EAPI=2
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
PATCHSET_VER="0"
MY_PV=${PV/%?/-2011-06-28}
MY_P=${PN}-compiler-${MY_PV/_/-}
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
SRC_URI="http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.07-beta/${MY_P}-unstable.tar.gz
mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
test? ( http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.07-beta/mercury-tests-${MY_PV/_/-}-unstable.tar.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug emacs erlang examples java minimal readline test threads"
DEPEND="!dev-libs/mpatrol
!dev-util/mono-debugger
readline? ( sys-libs/readline )
erlang? ( dev-lang/erlang )
java? ( >=virtual/jdk-1.5 )"
RDEPEND="${DEPEND}
emacs? ( virtual/emacs )"
S="${WORKDIR}"/${MY_P}
TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV/_/-}
SITEFILE=50${PN}-gentoo.el
src_prepare() {
cd "${WORKDIR}"
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
sed -i -e "s/@libdir@/$(get_libdir)/" \
"${S}"/scripts/Mmake.vars.in \
|| die "sed libdir failed"
if use test; then
epatch "${WORKDIR}"/${PV}-tests
fi
cd "${S}"
eautoconf
}
src_configure() {
strip-flags
local myconf
myconf="--libdir=/usr/$(get_libdir) \
--disable-gcc-back-end \
--disable-deep-profiler \
--disable-dotnet-grades \
$(use_enable erlang erlang-grade) \
$(use_enable java java-grade) \
$(use_enable debug debug-grades) \
$(use_enable threads par-grades) \
$(use_enable !minimal most-grades) \
$(use_with readline)"
econf ${myconf}
}
src_compile() {
# Generate Mercury .m dependencies. This step will vacuously
# succeed if we do not have a bootstrappable instance of mmc
# already installed. This step is required as mmc does not wait
# for all dependencies to be generated before compiling .m files.
emake \
PARALLEL=${MAKEOPTS} \
bootstrap_depend || die "emake depend failed"
# Build Mercury using base llds grade
emake \
PARALLEL=${MAKEOPTS} \
EXTRA_MLFLAGS=--no-strip \
EXTRA_LDFLAGS="${LDFLAGS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
|| die "emake failed"
# We can now patch .m Mercury compiler files since we
# have just built mercury_compiler.
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}-mmc
sed -i -e "s/@libdir@/$(get_libdir)/" \
"${S}"/compiler/file_util.m \
"${S}"/compiler/make.program_target.m \
|| die "sed libdir failed"
# Rebuild Mercury compiler using the just built mercury_compiler
emake \
PARALLEL=${MAKEOPTS} \
EXTRA_MLFLAGS=--no-strip \
EXTRA_LDFLAGS="${LDFLAGS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
MERCURY_COMPILER="${S}"/compiler/mercury_compile \
compiler || die "emake compiler failed"
# The default Mercury grade may not be the same as the grade used to
# compile the llds base grade. Since src_test() is run before
# src_install() we compile the default grade now
emake \
PARALLEL=${MAKEOPTS} \
EXTRA_MLFLAGS=--no-strip \
EXTRA_LDFLAGS="${LDFLAGS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
MERCURY_COMPILER="${S}"/compiler/mercury_compile \
default_grade || die "emake default_grade failed"
}
src_test() {
TEST_GRADE=`scripts/ml --print-grade`
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 \
|| die "sed WORKSPACE failed"
# Mercury tests must be run in C locale since Mercury output is
# compared to hard-coded warnings/errors
LC_ALL="C" \
PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
TERM="" \
WORKSPACE="${TWS}" \
MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
MERCURY_CONFIG_DIR="${TWS}" \
MMAKE_DIR="${TWS}"/scripts \
MERCURY_SUPPRESS_STACK_TRACE=yes \
GRADE=${TEST_GRADE} \
MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-I${TWS}/boehm_gc/include \
-I${TWS}/runtime \
-I${TWS}/library \
-I${TWS}/mdbcomp \
-I${TWS}/browser \
-I${TWS}/trace" \
mmake || die "mmake test failed"
}
src_install() {
emake \
PARALLEL=${MAKEOPTS} \
EXTRA_LDFLAGS="${LDFLAGS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
MERCURY_COMPILER="${S}"/compiler/mercury_compile \
INSTALL_PREFIX="${D}"/usr \
INSTALL_MAN_DIR="${D}"/usr/share/man \
INSTALL_INFO_DIR="${D}"/usr/share/info \
INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
install || die "make install failed"
if use emacs; then
elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
|| die "elisp-site-file-install failed"
fi
dodoc \
BUGS HISTORY LIMITATIONS NEWS README README.Linux \
README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
if use erlang; then
dodoc README.Erlang || die
fi
if use java; then
dodoc README.Java || die
fi
if use examples; then
insinto /usr/share/doc/${PF}/samples
doins samples/{*.m,README,Mmakefile} || die
doins -r samples/c_interface \
samples/diff \
samples/muz \
samples/rot13 \
samples/solutions \
samples/solver_types || die
if use java; then
doins -r samples/java_interface || die
fi
rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-name CVS -o -name .cvsignore)
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-11.07_beta1.ebuild
@ 2011-07-05 7:07 Keri Harris (keri)
0 siblings, 0 replies; 3+ messages in thread
From: Keri Harris (keri) @ 2011-07-05 7:07 UTC (permalink / raw
To: gentoo-commits
keri 11/07/05 07:07:57
Modified: ChangeLog mercury-11.07_beta1.ebuild
Log:
Provide upstream workaround for mgnuc problems with GCC 4.4-4.6 on x86
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.141 dev-lang/mercury/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 30 Jun 2011 07:53:16 -0000 1.140
+++ ChangeLog 5 Jul 2011 07:07:57 -0000 1.141
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.140 2011/06/30 07:53:16 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.141 2011/07/05 07:07:57 keri Exp $
+
+ 05 Jul 2011; <keri@gentoo.org> mercury-11.07_beta1.ebuild:
+ Provide upstream workaround for mgnuc problems with GCC 4.4-4.6 on x86
*mercury-11.07_beta1 (30 Jun 2011)
1.2 dev-lang/mercury/mercury-11.07_beta1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild?r1=1.1&r2=1.2
Index: mercury-11.07_beta1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercury-11.07_beta1.ebuild 30 Jun 2011 07:53:16 -0000 1.1
+++ mercury-11.07_beta1.ebuild 5 Jul 2011 07:07:57 -0000 1.2
@@ -1,12 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild,v 1.1 2011/06/30 07:53:16 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07_beta1.ebuild,v 1.2 2011/07/05 07:07:57 keri Exp $
EAPI=2
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-PATCHSET_VER="0"
+PATCHSET_VER="1"
MY_PV=${PV/%?/-2011-06-28}
MY_P=${PN}-compiler-${MY_PV/_/-}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-11.07_beta1.ebuild
@ 2012-03-09 21:18 Keri Harris (keri)
0 siblings, 0 replies; 3+ messages in thread
From: Keri Harris (keri) @ 2012-03-09 21:18 UTC (permalink / raw
To: gentoo-commits
keri 12/03/09 21:18:07
Modified: ChangeLog
Removed: mercury-11.07_beta1.ebuild
Log:
Remove old beta version
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.146 dev-lang/mercury/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.145&r2=1.146
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 9 Mar 2012 20:00:21 -0000 1.145
+++ ChangeLog 9 Mar 2012 21:18:07 -0000 1.146
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.145 2012/03/09 20:00:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.146 2012/03/09 21:18:07 keri Exp $
+
+ 09 Mar 2012; <keri@gentoo.org> -mercury-11.07_beta1.ebuild:
+ Remove old beta version
*mercury-11.07.1 (09 Mar 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-09 21:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-05 7:07 [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-11.07_beta1.ebuild Keri Harris (keri)
-- strict thread matches above, loose matches on Subject: below --
2012-03-09 21:18 Keri Harris (keri)
2011-06-30 7:53 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