Author: hwright
Date: Mon May 17 21:25:16 2010
New Revision: 945378
URL: http://svn.apache.org/viewvc?rev=945378&view=rev
Log:
* tools/buildbot/slaves/ubuntu-x64/svnbuild.sh:
Update configure flags for Java.
Modified:
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
Modified: subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh?rev=945378&r1=945377&r2=945378&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh Mon May 17
21:25:16 2010
@@ -1,24 +1,4 @@
#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
set -x
@@ -30,7 +10,7 @@ echo "========= autogen.sh"
echo "========= configure"
./configure --enable-javahl --enable-maintainer-mode \
--without-berkeley-db \
- --with-jdk=/usr/lib/jvm/java-6-sun-1.6.0.16 \
+ --with-jdk=/usr/lib/jvm/java-6-openjdk/ \
--with-junit=/usr/share/java/junit.jar || exit $?
echo "========= make"
