# HG changeset patch
# User ptisnovs
# Date 1304587539 -7200
# Node ID d3a4c323b5940a9d9ee9dd0c8de2d8719416a12c
# Parent  4acf4a27e0fa264b4dd6690264922b55467a8dc7
Added --disable-system-lcms to IcedTea7 configuration parameters.

diff -r 4acf4a27e0fa -r d3a4c323b594 icedtea/build.sh
--- 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=$?
diff -r 4acf4a27e0fa -r d3a4c323b594 icedtea/master.cfg
--- 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"],