# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1305888608 -7200
# Node ID c02bdc56dc6ec265c4b9dd65479806d9edf36336
# Parent  d3a4c323b5940a9d9ee9dd0c8de2d8719416a12c
Add more --disable-system-lcms to IcedTea7 master.cfg configurations.

Also add a f3an7 BuildFactory variant for icedtea7-natty-armv7l-quick.

diff -r d3a4c323b594 -r c02bdc56dc6e icedtea/master.cfg
--- a/icedtea/master.cfg	Thu May 05 11:25:39 2011 +0200
+++ b/icedtea/master.cfg	Fri May 20 12:50:08 2011 +0200
@@ -380,6 +380,28 @@
                       description="check-langtools",
                       workdir="build", timeout=2400))
 
+f3an7 = factory.BuildFactory()
+f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3an7.addStep(ShellCommand(command=["./autogen.sh"],
+                        workdir="src",
+                        description="autogen"))
+f3an7.addStep(ShellCommand(command=["rm", "-rf", "build"],
+                        workdir=".",
+                        description="clean build dir"))
+f3an7.addStep(Configure(command=["../src/configure",
+                              "--disable-bootstrap",
+                              "--with-parallel-jobs=2",
+                              "--disable-docs",
+                              "--disable-system-lcms"],
+                              workdir="build"))
+f3an7.addStep(Compile(workdir="build"))
+f3an7.addStep(JTRegCheck(command=["make", "check-hotspot"],
+                      description="check-hotspot",
+                      workdir="build"))
+f3an7.addStep(JTRegCheck(command=["make", "check-langtools"],
+                      description="check-langtools",
+                      workdir="build", timeout=2400))
+
 f3anc = factory.BuildFactory()
 f3anc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3anc.addStep(ShellCommand(command=["./autogen.sh"],
@@ -550,7 +572,8 @@
 f3a5.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=1",
-                              "--disable-docs"],
+                              "--disable-docs",
+                              "--disable-system-lcms"],
                               workdir="build"))
 f3a5.addStep(Compile(workdir="build"))
 f3a5.addStep(JTRegCheck(command=["make", "check-hotspot"],
@@ -723,7 +746,7 @@
 icedtea7_builder_quick_arm_natty = { 'name': "icedtea7-natty-armv7l-quick",
                            'slavenames': ["natty-armv7l"],
                            'builddir': "icedtea7-natty-armv7l-quick",
-                           'factory': f3an }
+                           'factory': f3an7 }
 
 f4 = factory.BuildFactory()
 f4.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -740,7 +763,8 @@
                               "--enable-nss",
                               "--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"))
 f4.addStep(Compile(workdir="build"))
 f4.addStep(JTRegCheck(command=["make", "check-hotspot"],