dev-lang/mosml Fix lack of respect for LDFLAGS and jobserver.

(Portage version: 2.2.0_alpha4/cvs/Linux i686)

2 files changed, 30 insertions, 15 deletions

diff --git a/dev-lang/mosml/ChangeLog b/dev-lang/mosml/ChangeLog
index cdd139f5e661..8124087f424f 100644
--- a/dev-lang/mosml/ChangeLog
+++ b/dev-lang/mosml/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/mosml
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.13 2010/04/06 09:13:55 abcd Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.14 2011/01/13 13:50:45 c1pher Exp $
+
+  13 Jan 2011; Dane Smith <c1pher@gentoo.org> mosml-2.01-r1.ebuild:
+  QA: Fix LDFLAGS respect wrt bug 351040.
+  *Fix lack of jobserver respect.
+  *Remove what I believe to be an unnecessary -j1 on emake install. I was
+  unable
+  to replecate a parallel-make issue, and was unable to find a bug
+  specifying
+  there ever was one.
+  *Ebuild cleanup.
 
   06 Apr 2010; Jonathan Callen <abcd@gentoo.org> mosml-2.01-r1.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/dev-lang/mosml/mosml-2.01-r1.ebuild b/dev-lang/mosml/mosml-2.01-r1.ebuild
index e65c911e366b..72f6637fdef3 100644
--- a/dev-lang/mosml/mosml-2.01-r1.ebuild
+++ b/dev-lang/mosml/mosml-2.01-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01-r1.ebuild,v 1.6 2010/04/06 15:17:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01-r1.ebuild,v 1.7 2011/01/13 13:50:45 c1pher Exp $
 
 EAPI="3"
 
@@ -26,8 +26,13 @@ src_prepare() {
 	#Fixing pre-stripped files
 	sed -i -e "/STRIP/d" mosmlyac/Makefile || die "sed Makefile failed"
 	sed -i -e "/STRIP/d" runtime/Makefile || die "sed Makefile failed"
-
-	sed -i -e "s|^CPP=/lib/cpp|CPP=${EPREFIX}/usr/bin/cpp|" Makefile.inc
+	sed -i -e 's/make/$(MAKE)/g' Makefile runtime/Makefile mosmlyac/Makefile \
+		mosmllib/Makefile  compiler/Makefile toolssrc/Makefile lex/Makefile \
+		launch/Makefile doc/Makefile config/Makefile || die "Sed failed"
+	sed -i -e 's/$(LD)/$(LD) $(LDFLAGS)/g' runtime/Makefile || die "Sed failed"
+	sed -i -e "s|^CPP=/lib/cpp|CPP=${EPREFIX}/usr/bin/cpp|" Makefile.inc \
+		|| die "Sed failed"
+	sed -i -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS)/' mosmlyac/Makefile || die "Sed failed"
 }
 
 src_configure() { :; }
@@ -38,15 +43,15 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 MOSMLHOME="${ED}"/opt/mosml install || die
-	rm "${ED}"opt/mosml/lib/camlrunm # This is a bad symlink
+	emake MOSMLHOME="${ED}"/opt/mosml install || die
+	rm "${ED}"opt/mosml/lib/camlrunm || die # This is a bad symlink
 	echo "#!${EPREFIX}/opt/mosml/bin/camlrunm" > "${ED}"opt/mosml/lib/header
 
-	dodoc  ../README
-	dosym  /opt/mosml/bin/mosml     /usr/bin/mosml
-	dosym  /opt/mosml/bin/mosmlc    /usr/bin/mosmlc
-	dosym  /opt/mosml/bin/mosmllex  /usr/bin/mosmllex
-	dosym  /opt/mosml/bin/mosmlyac  /usr/bin/mosmlyac
-	dosym  /opt/mosml/bin/camlrunm  /usr/bin/camlrunm
-	dosym  /opt/mosml/bin/camlrunm  /opt/mosml/lib/camlrunm
+	dodoc  ../README || die
+	dosym  /opt/mosml/bin/mosml     /usr/bin/mosml || die
+	dosym  /opt/mosml/bin/mosmlc    /usr/bin/mosmlc || die
+	dosym  /opt/mosml/bin/mosmllex  /usr/bin/mosmllex || die
+	dosym  /opt/mosml/bin/mosmlyac  /usr/bin/mosmlyac || die
+	dosym  /opt/mosml/bin/camlrunm  /usr/bin/camlrunm || die
+	dosym  /opt/mosml/bin/camlrunm  /opt/mosml/lib/camlrunm || die
 }