changeset 51:90ea40e540b6

Use --disable-system-lcms for f3h, f3c, f3j, f3a5j, f3a5c builder factorys. Fixes: configure: error: Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.
author Xerxes Ranby <xerxes@zafena.se>
date Fri, 20 Dec 2013 13:07:27 +0100
parents 9a1f4a5e1a82
children a5f4ccb35eeb
files icedtea/master.cfg
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/master.cfg	Thu Nov 08 18:38:56 2012 -0500
+++ b/icedtea/master.cfg	Fri Dec 20 13:07:27 2013 +0100
@@ -314,6 +314,7 @@
                       description="check-langtools",
                       workdir="build"))
 
+#icedtea6-squeeze-x86_64-quick-hotspot
 f3h = factory.BuildFactory()
 f3h.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3h.addStep(ShellCommand(command=["./autogen.sh"],
@@ -325,6 +326,7 @@
 f3h.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--disable-optimizations",
+                              "--disable-system-lcms",
                               "--disable-docs",
                               "--with-hotspot-build",
                               "--with-parallel-jobs=4"],
@@ -337,6 +339,7 @@
                       description="check-langtools",
                       workdir="build"))
 
+#icedtea6-squeeze-x86_64-quick-jamvm
 f3j = factory.BuildFactory()
 f3j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3j.addStep(ShellCommand(command=["./autogen.sh"],
@@ -347,6 +350,7 @@
                         description="clean build dir"))
 f3j.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
+                              "--disable-system-lcms",
                               "--disable-docs",
                               "--enable-jamvm"],
                               workdir="build"))
@@ -358,6 +362,7 @@
                       description="check-langtools",
                       workdir="build"))
 
+#icedtea6-squeeze-x86_64-quick-cacao
 f3c = factory.BuildFactory()
 f3c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3c.addStep(ShellCommand(command=["./autogen.sh"],
@@ -368,6 +373,7 @@
                         description="clean build dir"))
 f3c.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
+                              "--disable-system-lcms",
                               "--disable-docs",
                               "--enable-cacao"],
                               workdir="build"))
@@ -744,6 +750,7 @@
                         description="killall"))
 
 
+#icedtea6-squeeze-armv5tel-quick-cacao
 f3a5c = factory.BuildFactory()
 f3a5c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3a5c.addStep(ShellCommand(command=["./autogen.sh"],
@@ -755,6 +762,7 @@
 f3a5c.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=1",
+                              "--disable-system-lcms",
                               "--disable-docs",
                               "--enable-cacao"],
                               workdir="build"))
@@ -777,6 +785,7 @@
                         description="killall"))
 
 
+#icedtea6-squeeze-armv5tel-quick-jamvm
 f3a5j = factory.BuildFactory()
 f3a5j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3a5j.addStep(ShellCommand(command=["./autogen.sh"],
@@ -789,6 +798,7 @@
                               "--enable-jamvm",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=1",
+                              "--disable-system-lcms",
                               "--disable-docs"],
                               workdir="build"))
 f3a5j.addStep(Compile(workdir="build"))