# HG changeset patch # User Xerxes Ranby # Date 1387550328 -3600 # Node ID a5f4ccb35eeb6b49d51f6fe451da512fecdcd230 # Parent 90ea40e540b60da505694b41ff0bb989da481437 Use --disable-system-lcms for f3s6, f3ls, f3lc, f3lj, f3lz builder factorys. Fixes: configure: error: Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy. diff -r 90ea40e540b6 -r a5f4ccb35eeb icedtea/master.cfg --- a/icedtea/master.cfg Fri Dec 20 13:07:27 2013 +0100 +++ b/icedtea/master.cfg Fri Dec 20 15:38:48 2013 +0100 @@ -263,6 +263,7 @@ 'builddir': "testrepo_squeeze_armv5tel", 'factory': f2 } +#icedtea6-squeeze-x86_64-quick f3s6 = factory.BuildFactory() f3s6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3s6.addStep(ShellCommand(command=["./autogen.sh"], @@ -274,6 +275,7 @@ f3s6.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--disable-optimizations", + "--disable-system-lcms", "--disable-docs", "--with-additional-vms=jamvm,cacao,shark", "--with-parallel-jobs=4", @@ -594,6 +596,7 @@ alwaysRun=True, description="killall")) +#icedtea6-lucid-ia32-quick-zero f3lz = factory.BuildFactory() f3lz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3lz.addStep(ShellCommand(command=["./autogen.sh"], @@ -605,6 +608,7 @@ f3lz.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--with-parallel-jobs=5", + "--disable-system-lcms", "--disable-docs", "--with-hotspot-build", "--enable-zero"], @@ -625,6 +629,7 @@ alwaysRun=True, description="killall")) +#icedtea6-lucid-ia32-quick-shark f3ls = factory.BuildFactory() f3ls.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3ls.addStep(ShellCommand(command=["./autogen.sh"], @@ -636,6 +641,7 @@ f3ls.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--with-parallel-jobs=5", + "--disable-system-lcms", "--disable-docs", "--with-hotspot-build", "--enable-shark"], @@ -656,6 +662,7 @@ alwaysRun=True, description="killall")) +#icedtea6-lucid-ia32-quick-cacao f3lc = factory.BuildFactory() f3lc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3lc.addStep(ShellCommand(command=["./autogen.sh"], @@ -667,6 +674,7 @@ f3lc.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--with-parallel-jobs=5", + "--disable-system-lcms", "--disable-docs", "--with-hotspot-build", "--enable-cacao"], @@ -687,6 +695,7 @@ alwaysRun=True, description="killall")) +#icedtea6-lucid-ia32-quick-jamvm f3lj = factory.BuildFactory() f3lj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3lj.addStep(ShellCommand(command=["./autogen.sh"], @@ -699,6 +708,7 @@ "--enable-jamvm", "--disable-bootstrap", "--with-parallel-jobs=2", + "--disable-system-lcms", "--disable-docs"], workdir="build")) f3lj.addStep(Compile(workdir="build"))