[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] Fix for OSX build
From: |
François Revol |
Subject: |
[cp-patches] Fix for OSX build |
Date: |
Mon, 22 Mar 2010 19:26:15 +0100 CET |
Hi,
I recently tried to build microjonas on jamvm+classpath, using OSX
10.6, and I had to work around the antlr test in classpath:
- the jar built by MacPorts is located in /opt/local/lib,
- the sed regexp used to figure out the antlr version seem to be
specific to GNU sed...
The attached patch fixes both.
François.
diff -ur classpath-0.98.org/m4/ac_prog_antlr.m4
classpath-0.98/m4/ac_prog_antlr.m4
--- classpath-0.98.org/m4/ac_prog_antlr.m4 2008-10-21 00:07:21.000000000
+0200
+++ classpath-0.98/m4/ac_prog_antlr.m4 2010-03-11 17:16:31.000000000 +0100
@@ -3,7 +3,7 @@
AC_MSG_CHECKING([for the ANTLR parser generator JAR file])
if test -z "$ANTLR_JAR"; then
for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` \
- /usr/share/antlr/lib /usr/share/java /usr/lib;
+ /usr/share/antlr/lib /usr/share/java /usr/lib /opt/local/lib;
do
if test -f "$antlr_lib_home/antlr.jar"; then
ANTLR_JAR="$antlr_lib_home/antlr.jar"
@@ -31,7 +31,7 @@
AC_MSG_CHECKING([for antlr $1.$2.$3 or better])
antlr_version_str=`$ANTLR 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'`
if test "$antlr_version_str"; then
-
antlr_version_regex='s/\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\).*$/'
+
antlr_version_regex='s/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*$/'
antlr_version_major=`echo $antlr_version_str | sed
"$antlr_version_regex\\1/"`
antlr_version_minor=`echo $antlr_version_str | sed
"$antlr_version_regex\\2/"`
antlr_version_micro=`echo $antlr_version_str | sed
"$antlr_version_regex\\3/"`
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] Fix for OSX build,
François Revol <=