From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NikO4-0001Sc-Hy for garchives@archives.gentoo.org; Sat, 20 Feb 2010 08:08:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E025FE0A94; Sat, 20 Feb 2010 08:08:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A641DE0A94 for ; Sat, 20 Feb 2010 08:08:25 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 627BB1B406C for ; Sat, 20 Feb 2010 08:08:25 +0000 (UTC) Received: from keri by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NikO0-000463-Rr for gentoo-commits@lists.gentoo.org; Sat, 20 Feb 2010 08:08:24 +0000 From: "Keri Harris (keri)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, keri@gentoo.org Subject: [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 X-VCS-Repository: gentoo-x86 X-VCS-Files: mercury-extras-10.04_beta1-no-java-grade.patch mercury-extras-10.04_beta1-lex.patch X-VCS-Directories: dev-lang/mercury-extras/files X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris Content-Type: text/plain; charset=utf8 Message-Id: Sender: Keri Harris Date: Sat, 20 Feb 2010 08:08:24 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ebe390ee-6cf9-49f1-953c-ca8001201697 X-Archives-Hash: 10f3686d533cdc739d359578226eba90 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_b= eta1-lex.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-e= xtras/files/mercury-extras-10.04_beta1-lex.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-e= xtras/files/mercury-extras-10.04_beta1-lex.patch?rev=3D1.2&content-type=3D= text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-e= xtras/files/mercury-extras-10.04_beta1-lex.patch?r1=3D1.1&r2=3D1.2 Index: mercury-extras-10.04_beta1-lex.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/files/mercury-e= xtras-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 =3D all + ++LIBGRADES :=3D $(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_b= eta1-no-java-grade.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-e= xtras/files/mercury-extras-10.04_beta1-no-java-grade.patch?rev=3D1.1&view= =3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-e= xtras/files/mercury-extras-10.04_beta1-no-java-grade.patch?rev=3D1.1&cont= ent-type=3Dtext/plain Index: mercury-extras-10.04_beta1-no-java-grade.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -ur mercury-extras-10.04-beta.orig/cgi/Mmakefile mercury-extras-10.0= 4-beta/cgi/Mmakefile --- mercury-extras-10.04-beta.orig/cgi/Mmakefile 2004-07-30 19:01:07.0000= 00000 +1200 +++ mercury-extras-10.04-beta/cgi/Mmakefile 2010-02-20 19:37:53.000000000= +1300 @@ -12,6 +12,8 @@ =20 MAIN_TARGET =3D $(LIBRARY) =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + MCFLAGS-mercury_www =3D --no-warn-nothing-exported =20 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 2= 3:44:11.000000000 +1300 +++ mercury-extras-10.04-beta/complex_numbers/Mmakefile 2010-02-20 19:41:= 36.000000000 +1300 @@ -10,6 +10,8 @@ =20 MAIN_TARGET =3D all =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + all: libcomplex_numbers =20 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.000= 000000 +1300 +++ mercury-extras-10.04-beta/curs/Mmakefile 2010-02-20 19:42:26.00000000= 0 +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 =3D asm_fast.gc hlc.gc +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) =20 # 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-1= 0.04-beta/curses/Mmakefile --- mercury-extras-10.04-beta.orig/curses/Mmakefile 2003-01-16 23:44:15.0= 00000000 +1300 +++ mercury-extras-10.04-beta/curses/Mmakefile 2010-02-20 19:43:04.000000= 000 +1300 @@ -13,6 +13,8 @@ # this line to include the appropriate curses library for your OS.=20 MLLIBS =3D -lncurses =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + -include ../Mmake.params =20 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 2= 0: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 =3D -g MLFLAGS +=3D --no-strip =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + -include ../Mmake.params =20 main_target: libdl diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile m= ercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile --- mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile 2006-0= 3-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 @@ =20 MAIN_TARGET =3D libmercury_glut =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + # The following libraries are for X on Linux (Debian) using Mesa. =09 # 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-2= 0 19:44:43.000000000 +1300 @@ -15,6 +15,8 @@ =20 MAIN_TARGET =3D libmercury_opengl =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + # Specify what libraries we need to link against for OpenGL on this syst= em. # (The following works on Debian with mesa as the OpenGL implementation)= . GL_LIBS =3D -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 @@ =20 MAIN_TARGET =3D $(LIBRARY) =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + depend: mercury_tcltk.depend =20 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 2= 3: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 :=3D $(INSTALL_PREFIX)/extras +LIBGRADES :=3D $(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.00= 0000000 +1300 +++ mercury-extras-10.04-beta/moose/Mmakefile 2010-02-20 19:45:19.0000000= 00 +1300 @@ -6,6 +6,7 @@ =20 # GRADE =3D asm_fast.gc.debug # GRADE =3D asm_fast.gc.prof +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) =20 # MCFLAGS =3D -O6 # MCFLAGS =3D --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.000= 000000 +1200 +++ mercury-extras-10.04-beta/odbc/Mmakefile 2010-02-20 19:49:20.00000000= 0 +1300 @@ -8,6 +8,7 @@ =20 #-----------------------------------------------------------------------= ------# # Configuration +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) =20 # The driver manager. # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_M= S. 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.00= 0000000 +1200 +++ mercury-extras-10.04-beta/posix/Mmakefile 2010-02-20 19:46:08.0000000= 00 +1300 @@ -8,6 +8,8 @@ =20 -include ../Mmake.params =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + # The following is needed (on some systems) to enable declarations of # Posix functions in standard C header files. MGNUCFLAGS =3D --no-ansi diff -ur mercury-extras-10.04-beta.orig/quickcheck/Mmakefile mercury-extr= as-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.00= 0000000 +1300 @@ -10,6 +10,8 @@ =20 MAIN_TARGET =3D all =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + .PHONY: depend depend: qcheck.depend test_qcheck.depend =20 diff -ur mercury-extras-10.04-beta.orig/xml/Mmakefile mercury-extras-10.0= 4-beta/xml/Mmakefile --- mercury-extras-10.04-beta.orig/xml/Mmakefile 2002-03-06 23:10:31.0000= 00000 +1300 +++ mercury-extras-10.04-beta/xml/Mmakefile 2010-02-20 19:46:26.000000000= +1300 @@ -8,6 +8,8 @@ =20 INSTALL_PREFIX :=3D $(INSTALL_PREFIX)/extras =20 +LIBGRADES :=3D $(filter-out java,$(LIBGRADES)) + .PHONY: default_target default_target: tryit libxml =20