[gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04-r1.ebuild

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-r1.ebuild
@ 2010-08-22  6:09 Keri Harris (keri)
  0 siblings, 0 replies; 2+ messages in thread
From: Keri Harris (keri) @ 2010-08-22  6:09 UTC (permalink / raw
  To: gentoo-commits

keri        10/08/22 06:09:57

  Modified:             ChangeLog
  Added:                mercury-10.04-r1.ebuild
  Log:
  Respect LDFLAGS
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.113                dev-lang/mercury/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	28 Jul 2010 08:24:55 -0000	1.112
+++ ChangeLog	22 Aug 2010 06:09:57 -0000	1.113
@@ -1,6 +1,12 @@
 # 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.112 2010/07/28 08:24:55 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.113 2010/08/22 06:09:57 keri Exp $
+
+*mercury-10.04-r1 (22 Aug 2010)
+
+  22 Aug 2010; <keri@gentoo.org> +mercury-10.04-r1.ebuild,
+  +files/mercury-10.04-linker-flags.patch:
+  Respect LDFLAGS
 
   28 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   +files/mercury-10.04-tests-static-link.patch:



1.1                  dev-lang/mercury/mercury-10.04-r1.ebuild

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

Index: mercury-10.04-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/08/22 06:09:57 keri Exp $

inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib

MY_P=${PN}-compiler-${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.cs.mu.oz.au/download/files/${MY_P}.tar.gz
	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"

IUSE="debug emacs erlang 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-${PV}

SITEFILE=50${PN}-gentoo.el

src_unpack() {
	unpack ${A}

	epatch "${FILESDIR}"/${P}-multilib.patch
	epatch "${FILESDIR}"/${P}-linker-flags.patch
	epatch "${FILESDIR}"/${P}-default-grade.patch
	epatch "${FILESDIR}"/${P}-boehm_gc.patch
	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
	epatch "${FILESDIR}"/${P}-docs.patch
	epatch "${FILESDIR}"/${P}-no-reconf.patch

	sed -i -e "s/@libdir@/$(get_libdir)/" \
		"${S}"/compiler/make.program_target.c \
		"${S}"/scripts/Mmake.vars.in

	if use test; then
		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
}

src_compile() {
	strip-flags

	local myconf
	myconf="--libdir=/usr/$(get_libdir) \
		--disable-gcc-back-end \
		--disable-aditi-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} \
		|| die "econf failed"
	emake \
		PARALLEL=${MAKEOPTS} \
		EXTRA_MLFLAGS=--no-strip \
		EXTRA_LDFLAGS="${LDFLAGS}" \
		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
		|| die "emake failed"

	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

	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

	if use erlang; then
		dodoc README.Erlang
	fi

	if use java; then
		dodoc README.Java
	fi
}

pkg_postinst() {
	use emacs && elisp-site-regen
}

pkg_postrm() {
	use emacs && elisp-site-regen
}






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

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

keri        10/11/03 07:32:54

  Modified:             ChangeLog mercury-10.04-r1.ebuild
  Log:
  Bundle patches into distfiles tarball.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.126                dev-lang/mercury/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog	3 Nov 2010 07:10:08 -0000	1.125
+++ ChangeLog	3 Nov 2010 07:32:54 -0000	1.126
@@ -1,6 +1,9 @@
 # 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.125 2010/11/03 07:10:08 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.126 2010/11/03 07:32:54 keri Exp $
+
+  03 Nov 2010; <keri@gentoo.org> mercury-10.04-r1.ebuild:
+  Bundle patches into distfiles tarball.
 
   03 Nov 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   mercury-10.04.1.ebuild, -files/mercury-10.04.1-boehm_gc.patch,



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

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

Index: mercury-10.04-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercury-10.04-r1.ebuild	22 Aug 2010 06:09:57 -0000	1.1
+++ mercury-10.04-r1.ebuild	3 Nov 2010 07:32:54 -0000	1.2
@@ -1,14 +1,16 @@
 # 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-r1.ebuild,v 1.1 2010/08/22 06:09:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04-r1.ebuild,v 1.2 2010/11/03 07:32:54 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 MY_P=${PN}-compiler-${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.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,23 +36,16 @@
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-linker-flags.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/make.program_target.c \
 		"${S}"/scripts/Mmake.vars.in
 
 	if use test; then
-		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
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 }
 






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

end of thread, other threads:[~2010-11-03  7:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-03  7:32 [gentoo-commits] gentoo-x86 commit in dev-lang/mercury: ChangeLog mercury-10.04-r1.ebuild Keri Harris (keri)
  -- strict thread matches above, loose matches on Subject: below --
2010-08-22  6:09 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