Author: pluto Date: Sun Aug 6 22:35:02 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - always build gcc jar wrapper.
---- Files affected: SOURCES: gcc-force_jar_wrapper.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gcc-force_jar_wrapper.patch diff -u /dev/null SOURCES/gcc-force_jar_wrapper.patch:1.1 --- /dev/null Mon Aug 7 00:35:02 2006 +++ SOURCES/gcc-force_jar_wrapper.patch Mon Aug 7 00:34:57 2006 @@ -0,0 +1,19 @@ +--- trunk/libjava/configure.ac.orig 2006-07-06 11:12:25.000000000 +0200 ++++ trunk/libjava/configure.ac 2006-07-06 19:56:51.347768250 +0200 +@@ -143,14 +143,11 @@ + AC_CHECK_TOOL(AR, ar) + AC_CHECK_TOOL(RANLIB, ranlib, :) + AC_PROG_AWK +-AC_CHECK_PROGS([JAR], [jar fastjar], no) + AC_PATH_PROG([ZIP], [zip], no) + AC_PATH_PROG([UNZIP], [unzip], unzip) +-AM_CONDITIONAL(BASH_JAR, test "$JAR" = no) ++AM_CONDITIONAL(BASH_JAR, /bin/true) + if test "$ZIP" = no; then +- if test "$JAR" = no; then +- AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue]) +- fi ++ AC_MSG_ERROR([cannot find zip, cannot continue]) + else + # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava + JAR=`pwd`/scripts/jar ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
