* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras/files: mercury-extras-10.04_beta1-no-java-grade.patch mercury-extras-10.04_beta1-lex.patch
@ 2010-02-20 8:08 Keri Harris (keri)
0 siblings, 0 replies; only message in thread
From: Keri Harris (keri) @ 2010-02-20 8:08 UTC (permalink / raw
To: gentoo-commits
keri 10/02/20 08:08:24
Modified: mercury-extras-10.04_beta1-lex.patch
Added: mercury-extras-10.04_beta1-no-java-grade.patch
Log:
Disable java-grade in install_libgrades
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch?r1=1.1&r2=1.2
Index: mercury-extras-10.04_beta1-lex.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercury-extras-10.04_beta1-lex.patch 13 Feb 2010 02:53:04 -0000 1.1
+++ mercury-extras-10.04_beta1-lex.patch 20 Feb 2010 08:08:24 -0000 1.2
@@ -20,6 +20,8 @@
+
+MAIN_TARGET = all
+
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+.PHONEY: all depend install
+
+all: liblex libregex
@@ -27,5 +29,5 @@
+depend: lex.depend regex.depend
+
+install:
-+ $(MMAKE) $(MMAKEFLAGS) liblex.install
-+ $(MMAKE) $(MMAKEFLAGS) libregex.install
++ $(MMAKE) liblex.install
++ $(MMAKE) libregex.install
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch?rev=1.1&content-type=text/plain
Index: mercury-extras-10.04_beta1-no-java-grade.patch
===================================================================
diff -ur mercury-extras-10.04-beta.orig/cgi/Mmakefile mercury-extras-10.04-beta/cgi/Mmakefile
--- mercury-extras-10.04-beta.orig/cgi/Mmakefile 2004-07-30 19:01:07.000000000 +1200
+++ mercury-extras-10.04-beta/cgi/Mmakefile 2010-02-20 19:37:53.000000000 +1300
@@ -12,6 +12,8 @@
MAIN_TARGET = $(LIBRARY)
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
MCFLAGS-mercury_www = --no-warn-nothing-exported
depend: mercury_www.depend
diff -ur mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile mercury-extras-10.04-beta/complex_numbers/Mmakefile
--- mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile 2003-01-16 23:44:11.000000000 +1300
+++ mercury-extras-10.04-beta/complex_numbers/Mmakefile 2010-02-20 19:41:36.000000000 +1300
@@ -10,6 +10,8 @@
MAIN_TARGET = all
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
all: libcomplex_numbers
depend: complex_numbers.depend
diff -ur mercury-extras-10.04-beta.orig/curs/Mmakefile mercury-extras-10.04-beta/curs/Mmakefile
--- mercury-extras-10.04-beta.orig/curs/Mmakefile 2003-01-16 23:44:14.000000000 +1300
+++ mercury-extras-10.04-beta/curs/Mmakefile 2010-02-20 19:42:26.000000000 +1300
@@ -26,7 +26,7 @@
# Omit this line if you want to install the default grades.
# Edit this line if you want to install with different grades.
#
-#LIBGRADES = asm_fast.gc hlc.gc
+LIBGRADES := $(filter-out java,$(LIBGRADES))
# The following standard libraries must be linked against in any
# application using the curs library (i.e. MLLIBS must include
diff -ur mercury-extras-10.04-beta.orig/curses/Mmakefile mercury-extras-10.04-beta/curses/Mmakefile
--- mercury-extras-10.04-beta.orig/curses/Mmakefile 2003-01-16 23:44:15.000000000 +1300
+++ mercury-extras-10.04-beta/curses/Mmakefile 2010-02-20 19:43:04.000000000 +1300
@@ -13,6 +13,8 @@
# this line to include the appropriate curses library for your OS.
MLLIBS = -lncurses
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
-include ../Mmake.params
default_target: libmcurses
diff -ur mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile mercury-extras-10.04-beta/dynamic_linking/Mmakefile
--- mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300
+++ mercury-extras-10.04-beta/dynamic_linking/Mmakefile 2010-02-20 19:43:42.000000000 +1300
@@ -17,6 +17,8 @@
CFLAGS = -g
MLFLAGS += --no-strip
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
-include ../Mmake.params
main_target: libdl
diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile
--- mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200
+++ mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile 2010-02-20 19:44:06.000000000 +1300
@@ -10,6 +10,8 @@
MAIN_TARGET = libmercury_glut
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
# The following libraries are for X on Linux (Debian) using Mesa.
# Libaries required by X windows.
diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile
--- mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300
+++ mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile 2010-02-20 19:44:43.000000000 +1300
@@ -15,6 +15,8 @@
MAIN_TARGET = libmercury_opengl
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
# Specify what libraries we need to link against for OpenGL on this system.
# (The following works on Debian with mesa as the OpenGL implementation).
GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM
diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile
--- mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200
+++ mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile 2010-02-20 19:44:24.000000000 +1300
@@ -21,6 +21,8 @@
MAIN_TARGET = $(LIBRARY)
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
depend: mercury_tcltk.depend
install: libmercury_tcltk.install
diff -ur mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile mercury-extras-10.04-beta/lazy_evaluation/Mmakefile
--- mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile 2003-01-16 23:44:17.000000000 +1300
+++ mercury-extras-10.04-beta/lazy_evaluation/Mmakefile 2010-02-20 19:46:58.000000000 +1300
@@ -4,6 +4,8 @@
# Public License - see the file COPYING.LIB in the Mercury distribution.
#-----------------------------------------------------------------------------#
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
-include ../Mmake.params
default_target: all
depend: lazy_list.depend lazy_list_test.depend
diff -ur mercury-extras-10.04-beta.orig/moose/Mmakefile mercury-extras-10.04-beta/moose/Mmakefile
--- mercury-extras-10.04-beta.orig/moose/Mmakefile 2003-01-16 23:44:20.000000000 +1300
+++ mercury-extras-10.04-beta/moose/Mmakefile 2010-02-20 19:45:19.000000000 +1300
@@ -6,6 +6,7 @@
# GRADE = asm_fast.gc.debug
# GRADE = asm_fast.gc.prof
+LIBGRADES := $(filter-out java,$(LIBGRADES))
# MCFLAGS = -O6
# MCFLAGS = --intermodule-optimization -O6
diff -ur mercury-extras-10.04-beta.orig/odbc/Mmakefile mercury-extras-10.04-beta/odbc/Mmakefile
--- mercury-extras-10.04-beta.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200
+++ mercury-extras-10.04-beta/odbc/Mmakefile 2010-02-20 19:49:20.000000000 +1300
@@ -8,6 +8,7 @@
#-----------------------------------------------------------------------------#
# Configuration
+LIBGRADES := $(filter-out java,$(LIBGRADES))
# The driver manager.
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
diff -ur mercury-extras-10.04-beta.orig/posix/Mmakefile mercury-extras-10.04-beta/posix/Mmakefile
--- mercury-extras-10.04-beta.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200
+++ mercury-extras-10.04-beta/posix/Mmakefile 2010-02-20 19:46:08.000000000 +1300
@@ -8,6 +8,8 @@
-include ../Mmake.params
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
# The following is needed (on some systems) to enable declarations of
# Posix functions in standard C header files.
MGNUCFLAGS = --no-ansi
diff -ur mercury-extras-10.04-beta.orig/quickcheck/Mmakefile mercury-extras-10.04-beta/quickcheck/Mmakefile
--- mercury-extras-10.04-beta.orig/quickcheck/Mmakefile 2003-01-16 23:44:24.000000000 +1300
+++ mercury-extras-10.04-beta/quickcheck/Mmakefile 2010-02-20 19:47:12.000000000 +1300
@@ -10,6 +10,8 @@
MAIN_TARGET = all
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
.PHONY: depend
depend: qcheck.depend test_qcheck.depend
diff -ur mercury-extras-10.04-beta.orig/xml/Mmakefile mercury-extras-10.04-beta/xml/Mmakefile
--- mercury-extras-10.04-beta.orig/xml/Mmakefile 2002-03-06 23:10:31.000000000 +1300
+++ mercury-extras-10.04-beta/xml/Mmakefile 2010-02-20 19:46:26.000000000 +1300
@@ -8,6 +8,8 @@
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+
.PHONY: default_target
default_target: tryit libxml
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-20 8:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-20 8:08 [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras/files: mercury-extras-10.04_beta1-no-java-grade.patch mercury-extras-10.04_beta1-lex.patch 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