From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6530 invoked by alias); 7 Dec 2007 03:23:08 -0000 Received: (qmail 6493 invoked by uid 367); 7 Dec 2007 03:23:07 -0000 Date: Fri, 07 Dec 2007 03:23:00 -0000 Message-ID: <20071207032307.6478.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Facilitate dancing in the streets (when JAVAC=gcj --enable-jar-compile). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c609bbcdc6907752ed3ed955d4b5021a4492e6d3 X-Git-Newrev: af8def376f0ce3d3f216c3704bca8aec55843927 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00540.txt.bz2 The branch, master has been updated via af8def376f0ce3d3f216c3704bca8aec55843927 (commit) from c609bbcdc6907752ed3ed955d4b5021a4492e6d3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit af8def376f0ce3d3f216c3704bca8aec55843927 Author: Andrew Cagney Date: Thu Dec 6 21:34:18 2007 -0500 Facilitate dancing in the streets (when JAVAC=gcj --enable-jar-compile). frysk-common/ChangeLog 2007-12-06 Andrew Cagney * frysk-common.ac (--enable-jar-compile): When JAVAC is GCJ, default to on. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 3 +++ frysk-common/frysk-common.ac | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 49fc8e2..9d5bb00 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,8 @@ 2007-12-06 Andrew Cagney + * frysk-common.ac (--enable-jar-compile): When JAVAC is GCJ, + default to on. + * frysk-common.ac (GCJFLAGS): Add -fsource=1.4 when applicable. * frysk-common.ac (JAVACFLAGS): For GCJ, re-add -g -classpath lost diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac index 54baa98..32a2242 100644 --- a/frysk-common/frysk-common.ac +++ b/frysk-common/frysk-common.ac @@ -248,11 +248,18 @@ AC_ARG_WITH(libopcodes, LIBS="$LIBS -lopcodes"] []) +AC_MSG_CHECKING([direct .jar to .o compilation (--enable-jar-compile)]) AC_ARG_ENABLE([jar-compile], - [ --enable-jar-compile Enable compilation of jars], + [ --enable-jar-compile Enable direct compilation of jars], [case "${enableval}" in - yes) jar_compile=yes ;; - no) jar_compile=no;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-jar-compile]) ;; - esac],[jar_compile=no]) + yes) jar_compile=yes ;; + no) jar_compile=no;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-jar-compile]) ;; + esac], + [case "$JAVAC_IS" in + gcj) jar_compile=yes ;; + ecj) jar_compile=no ;; + *) AC_MSG_ERROR([compiler ${JAVAC_IS} unknown]) ;; + esac]) +AC_MSG_RESULT([$jar_compile]) AM_CONDITIONAL([JAR_COMPILE], [test x$jar_compile = xyes]) hooks/post-receive -- frysk system monitor/debugger