From eaee24e1aad2751aadf7091dfc1dbaf024cb4803 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 2 Jan 2021 23:42:43 +0000 Subject: [PATCH] X86: Add all Debian workers --- buildbot-config/platforms.py | 27 ++++++++++++++------ workers/debian-x86/Dockerfile.m4 | 27 ++++++++++++++++++++ workers/debian-x86_64-clang/Dockerfile.m4 | 23 +++++++++++++++++ workers/debian-x86_64/Dockerfile.m4 | 30 +++++++++++------------ workers/m4/debian-libraries.m4 | 22 +++++++++++++++++ 5 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 workers/debian-x86/Dockerfile.m4 create mode 100644 workers/debian-x86_64-clang/Dockerfile.m4 create mode 100644 workers/m4/debian-libraries.m4 diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index b247359..0b56737 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -204,12 +204,18 @@ android(suffix="x86-64", cxx_target="x86_64-linux-android", abi_version=21) -def debian_x86_64(): - platform = Platform("debian-x86-64") - platform.workerimage = "debian-x86_64" +def debian(name_suffix, image_suffix, host, + package=True, tests=True, buildconfigureargs=None, tools=True): + platform = Platform("debian-{0}".format(name_suffix)) + platform.workerimage = "debian-{0}".format(image_suffix) + if not tools: + platform.compatibleBuilds = (builds.ScummVMBuild, ) + + platform.env["CXX"] = "ccache ${CXX}" + platform.configureargs.append("--host={0}".format(host)) + if buildconfigureargs: + platform.buildconfigureargs = buildconfigureargs - platform.env["CXX"] = "ccache g++" - platform.configureargs.append("--host=x86_64-linux-gnu") # stable build don't have this target yet platform.packaging_cmd = { builds.ScummVMBuild: "dist-generic", @@ -234,9 +240,16 @@ def debian_x86_64(): "scummvm-tools-cli" ] } - platform.run_tests = True + platform.run_tests = tests + platform.packageable = package register_platform(platform) -debian_x86_64() +debian("i686", "x86", "i686-linux-gnu") +debian("x86-64", "x86_64", "x86_64-linux-gnu") +debian("x86-64-nullbackend", "x86_64", "x86_64-linux-gnu", package=False, tests=False, tools=False, + buildconfigureargs = { + builds.ScummVMBuild: [ "--backend=null" ], + }) +debian("x86-64-clang", "x86_64-clang", "x86_64-linux-gnu", package=False, tools=False) def caanoo(): platform = Platform("caanoo") diff --git a/workers/debian-x86/Dockerfile.m4 b/workers/debian-x86/Dockerfile.m4 new file mode 100644 index 0000000..2e9a147 --- /dev/null +++ b/workers/debian-x86/Dockerfile.m4 @@ -0,0 +1,27 @@ +m4_include(`paths.m4')m4_dnl + +m4_include(`debian-builder-base.m4')m4_dnl + +m4_define(`APT_ARCH',i386) + +RUN dpkg --add-architecture APT_ARCH + +m4_include(`debian-libraries.m4')m4_dnl + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + g++-i686-linux-gnu \ + && \ + rm -rf /var/lib/apt/lists/* + +ENV HOST=i386-linux-gnu BINHOST=i686-linux-gnu + +ENV \ + def_binaries(`/usr/bin/${BINHOST}-', `ar, as, c++filt, ld, link, nm, objcopy, objdump, ranlib, readelf, strings, strip') \ + def_binaries(`/usr/bin/${BINHOST}-', `gcc, cpp') \ + CC=/usr/bin/${BINHOST}-gcc \ + CXX=/usr/bin/${BINHOST}-g++ \ + def_aclocal(`/usr') \ + PKG_CONFIG_LIBDIR=/usr/lib/$HOST/pkgconfig + +m4_include(`run-buildbot.m4')m4_dnl diff --git a/workers/debian-x86_64-clang/Dockerfile.m4 b/workers/debian-x86_64-clang/Dockerfile.m4 new file mode 100644 index 0000000..b50ff72 --- /dev/null +++ b/workers/debian-x86_64-clang/Dockerfile.m4 @@ -0,0 +1,23 @@ +m4_include(`paths.m4')m4_dnl + +m4_include(`debian-builder-base.m4')m4_dnl + +m4_include(`debian-libraries.m4')m4_dnl + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + clang \ + lld \ + llvm \ + && \ + rm -rf /var/lib/apt/lists/* + +# We add PATH here for *-config and platform specific binaries +ENV \ + def_binaries(`/usr/bin/llvm-', `ar, as, cxxfilt, nm, objcopy, objdump, ranlib, readelf, strings, strip') \ + def_binaries(`/usr/bin/', `clang, clang++') \ + CC=/usr/bin/clang \ + CXX=/usr/bin/clang++ \ + LD=/usr/bin/lld + +m4_include(`run-buildbot.m4')m4_dnl diff --git a/workers/debian-x86_64/Dockerfile.m4 b/workers/debian-x86_64/Dockerfile.m4 index 33ffb88..3dc54b5 100644 --- a/workers/debian-x86_64/Dockerfile.m4 +++ b/workers/debian-x86_64/Dockerfile.m4 @@ -1,25 +1,23 @@ +m4_include(`paths.m4')m4_dnl + m4_include(`debian-builder-base.m4')m4_dnl +m4_include(`debian-libraries.m4')m4_dnl + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ g++ \ - liba52-dev \ - libcurl4-openssl-dev \ - libfaad-dev \ - libflac-dev \ - libfluidsynth-dev \ - libfreetype6-dev \ - libfribidi-dev \ - libjpeg62-turbo-dev \ - libmad0-dev \ - libmpeg2-4-dev \ - libpng-dev \ - libsdl2-dev \ - libsdl2-net-dev \ - libtheora-dev \ - libvorbis-dev \ - zlib1g-dev \ && \ rm -rf /var/lib/apt/lists/* +ENV HOST=x86_64-linux-gnu + +ENV \ + def_binaries(`/usr/bin/${HOST}-', `ar, as, c++filt, ld, link, nm, objcopy, objdump, ranlib, readelf, strings, strip') \ + def_binaries(`/usr/bin/${HOST}-', `gcc, cpp') \ + CC=/usr/bin/${HOST}-gcc \ + CXX=/usr/bin/${HOST}-g++ \ + def_aclocal(`/usr') \ + PKG_CONFIG_LIBDIR=/usr/lib/$HOST/pkgconfig + m4_include(`run-buildbot.m4')m4_dnl diff --git a/workers/m4/debian-libraries.m4 b/workers/m4/debian-libraries.m4 new file mode 100644 index 0000000..034db39 --- /dev/null +++ b/workers/m4/debian-libraries.m4 @@ -0,0 +1,22 @@ +m4_ifdef(`APT_ARCH',`m4_define(`APT_ARCH',`:'APT_ARCH)',`m4_define(`APT_ARCH',)') +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + liba52-dev`'APT_ARCH \ + libcurl4-openssl-dev`'APT_ARCH \ + libfaad-dev`'APT_ARCH \ + libflac-dev`'APT_ARCH \ + libfluidsynth-dev`'APT_ARCH \ + libfreetype6-dev`'APT_ARCH \ + libfribidi-dev`'APT_ARCH \ + libglew-dev`'APT_ARCH \ + libjpeg62-turbo-dev`'APT_ARCH \ + libmad0-dev`'APT_ARCH \ + libmpeg2-4-dev`'APT_ARCH \ + libpng-dev`'APT_ARCH \ + libsdl2-dev`'APT_ARCH \ + libsdl2-net-dev`'APT_ARCH \ + libtheora-dev`'APT_ARCH \ + libvorbis-dev`'APT_ARCH \ + zlib1g-dev`'APT_ARCH \ + && \ + rm -rf /var/lib/apt/lists/*