Mercurial > hg > buildbot

changeset 23:d3a4c323b594

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added --disable-system-lcms to IcedTea7 configuration parameters.
author ptisnovs
date Thu, 05 May 2011 11:25:39 +0200
parents 4acf4a27e0fa
children c02bdc56dc6e
files icedtea/build.sh icedtea/master.cfg
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/build.sh	Tue May 03 11:16:34 2011 +0200
+++ b/icedtea/build.sh	Thu May 05 11:25:39 2011 +0200
@@ -103,8 +103,10 @@
 # Some additional VMs only build against one or the other version.
 if [ "$1" == "6"]; then
  ICEDTEA_ADDITIONAL_VMS="cacao,jamvm,shark"
+ ADDITIONAL_OPTIONS=""
 elif [ "$1" == "7" ]; then
  ICEDTEA_ADDITIONAL_VMS="shark"
+ ADDITIONAL_OPTIONS="--disable-system-lcms"
 fi
 
 # Build in separate dir.
@@ -115,6 +117,7 @@
 	&& cd $ICEDTEA_BUILD_DIR \
 	&& $ICEDTEA_DIR/configure \
 		--enable-nss \
+                $ADDITIONAL_OPTIONS \
 		--with-additional-vms=$ICEDTEA_ADDITIONAL_VMS \
 	&& make VERBOSE=true) 2>&1 | tee $BUILD_LOG_FILE
 BUILD_RESULT=$?
--- a/icedtea/master.cfg	Tue May 03 11:16:34 2011 +0200
+++ b/icedtea/master.cfg	Thu May 05 11:25:39 2011 +0200
@@ -271,7 +271,8 @@
                               "--disable-docs",
                               "--with-additional-vms=shark",
                               "--with-parallel-jobs=4",
-                              "--with-llvm-config=llvm-config-2.7"],
+                              "--with-llvm-config=llvm-config-2.7",
+                              "--disable-system-lcms"],
                               workdir="build"))
 f3s7.addStep(Compile(workdir="build"))
 f3s7.addStep(JTRegCheck(command=["make", "check-hotspot"],