# HG changeset patch # User Markus Mützel # Date 1599994484 -7200 # Sun Sep 13 12:54:44 2020 +0200 # Node ID 4b3d198054e9bd3411cf4cfcd459bdd42d2d9cc5 # Parent f2bc3b63341497e564113e164162faf7bf7a1d00 Build native Octave for MXE cross-builds that don't create a tarball (bug #49503). * master.cfg: Cross-building from the current default or stable hg branch requires creating a tarball which in turn requires building a version of Octave that executes natively on the build system ("hg-octave-dist" target). Building from the release tarball, some Octave Forge packages might still need a native Octave as a build tool. So set the configure flags for the "build-octave" package accordingly. diff --git a/master.cfg b/master.cfg --- a/master.cfg +++ b/master.cfg @@ -729,8 +729,9 @@ return factory -def mk_w32_factory (nice, jobs, branch, compile_opts): +def mk_w32_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--disable-windows-64", @@ -740,8 +741,9 @@ compile_opts) -def mk_w64_32_factory (nice, jobs, branch, compile_opts): +def mk_w64_32_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--enable-windows-64", @@ -751,8 +753,9 @@ compile_opts) -def mk_w64_64_factory (nice, jobs, branch, compile_opts): +def mk_w64_64_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--enable-windows-64", @@ -794,47 +797,56 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "default", - ["nsis-installer", "7z-dist"]))) + ["--enable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "default", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-on-debian", workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "default", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "release", - ["nsis-installer", "7z-dist"]))) + ["--disable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "release", + ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "release", + ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "stable", - ["nsis-installer", "7z-dist"]))) + ["--enable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "stable", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "stable", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",