Commit b58fbfa8 authored by Matt Turner's avatar Matt Turner Committed by Marge Bot
Browse files

Remove Scons leftovers

Fixes: 6e6cd7d9

 ("scons: Remove.")
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Part-of: <!9738>
parent 40647fcc
Pipeline #292865 passed with stages
in 13 minutes and 32 seconds
......@@ -296,7 +296,7 @@ x86_build-base:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &x86_build-base "2021-02-08-container-reorg"
MESA_IMAGE_TAG: &x86_build-base "2021-03-25-no-scons"
.use-x86_build-base:
extends:
......@@ -492,7 +492,7 @@ armhf_test:
# Native Windows docker builds
#
# Unlike the above Linux-based builds - including MinGW/SCons builds which
# Unlike the above Linux-based builds - including MinGW builds which
# cross-compile for Windows - which use the freedesktop ci-templates, we
# cannot use the same scheme here. As Windows lacks support for
# Docker-in-Docker, and Podman does not run natively on Windows, we have
......@@ -589,8 +589,6 @@ sanity:
paths:
- _build/meson-logs/*.txt
- _build/meson-logs/strace
# scons:
- build/*/config.log
- shader-db
# Just Linux
......@@ -630,14 +628,6 @@ sanity:
script:
- .gitlab-ci/meson/build.sh
.scons-build:
extends:
- .build-linux
- .use-x86_build
stage: build-misc
script:
- env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh
meson-testing:
extends:
- .meson-build
......@@ -925,13 +915,6 @@ test-d3d12-windows:
paths:
- summary/
.scons-win64:
extends: .scons-build
variables:
SCONS_TARGET: platform=windows machine=x86_64 debug=1
SCONS_CHECK_COMMAND: "true"
allow_failure: true
meson-clover:
extends: .meson-build
variables:
......
......@@ -70,7 +70,6 @@ apt-get install -y --no-remove \
python3-pil \
python3-requests \
qemu-user \
scons \
valgrind \
wget \
wine64-development \
......
#!/bin/bash
set -e
set -o xtrace
if test -n "$LLVM_VERSION"; then
export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
fi
rm -rf build
scons $SCONS_TARGET force_scons=on
eval $SCONS_CHECK_COMMAND
......@@ -26,12 +26,6 @@ for libGL.so into::
lib/gallium/libswrAVX.so
lib/gallium/libswrAVX2.so
Alternatively, building with SCons will produce::
build/linux-x86_64/gallium/targets/libgl-xlib/libGL.so
build/linux-x86_64/gallium/drivers/swr/libswrAVX.so
build/linux-x86_64/gallium/drivers/swr/libswrAVX2.so
To use it set the LD_LIBRARY_PATH environment variable accordingly.
**IMPORTANT:** Mesa will default to using llvmpipe or softpipe as the default software renderer. To select the OpenSWR driver, set the GALLIUM_DRIVER environment variable appropriately: ::
......
......@@ -17,9 +17,7 @@ Build system
^^^^^^^^^^^^
- `Meson <https://mesonbuild.com>`__ is required when building on \*nix
platforms and is supported on Windows.
- `SCons <http://www.scons.org/>`__ is an alternative for building on
Windows and Linux.
platforms and on Windows.
- Android Build system when building as native Android component. Meson
is used when when building ARC.
......@@ -37,9 +35,7 @@ you're willing to maintain support for other compiler get in touch.
Third party/extra tools.
^^^^^^^^^^^^^^^^^^^^^^^^
- `Python <https://www.python.org/>`__ - Python is required. When
building with SCons 2.7 is required. When building with meson 3.5 or
newer is required.
- `Python <https://www.python.org/>`__ - Python 3.5 or newer is required.
- `Python Mako module <http://www.makotemplates.org/>`__ - Python Mako
module is required. Version 0.8.0 or later should work.
- lex / yacc - for building the Mesa IR and GLSL compiler.
......@@ -105,37 +101,7 @@ On Windows you can also use the Visual Studio backend
Please read the :doc:`detailed meson instructions <meson>` for more
information
3. Building with SCons (Windows/Linux)
--------------------------------------
To build Mesa with SCons on Linux or Windows do
::
scons
The build output will be placed in
build/\ *platform*-*machine*-*debug*/..., where *platform* is for
example Linux or Windows, *machine* is x86 or x86_64, optionally
followed by -debug for debug builds.
To build Mesa with SCons for Windows on Linux using the MinGW
crosscompiler toolchain do
::
scons platform=windows toolchain=crossmingw machine=x86 libgl-gdi
This will create:
- build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll — Mesa
+ Gallium + softpipe (or llvmpipe), binary compatible with Windows's
opengl32.dll
Put them all in the same directory to test them. Additional information
is available in `README.WIN32 <README.WIN32>`__.
4. Building with AOSP (Android)
3. Building with AOSP (Android)
-------------------------------
Currently one can build Mesa for Android as part of the AOSP project,
......@@ -148,7 +114,7 @@ the libGLES_mesa library.
FINISHME: Improve on the instructions add references to Rob H
repos/Jenkins, Android-x86 and/or other resources.
5. Library Information
4. Library Information
----------------------
When compilation has finished, look in the top-level ``lib/`` (or
......@@ -179,7 +145,7 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers:
If you built with Gallium support, look in lib/gallium/ for
Gallium-based versions of libGL and device drivers.
6. Building OpenGL programs with pkg-config
5. Building OpenGL programs with pkg-config
-------------------------------------------
Running ``ninja install`` will install package configuration files for
......
......@@ -37,8 +37,7 @@ Experimenting with Shader Replacements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Shaders can be dumped and replaced on runtime for debugging purposes.
This feature is not currently supported by SCons build. This is
controlled via following environment variables:
This is controlled via following environment variables:
- **MESA_SHADER_DUMP_PATH** - path where shader sources are dumped
- **MESA_SHADER_READ_PATH** - path where replacement shaders are read
......
......@@ -46,7 +46,6 @@ Additional driver information:
Window System
- :doc:`Xlib / swrast driver <xlibdriver>` for the X Window System
and Unix-like operating systems
- `Microsoft Windows <README.WIN32>`__
Deprecated Systems and Drivers
------------------------------
......
......@@ -135,49 +135,4 @@ test_c99_compat_h(const void * restrict a,
#endif
/* Fallback definitions, for scons which doesn't auto-detect these things. */
#ifdef HAVE_SCONS
# ifndef _WIN32
# define HAVE_PTHREAD
# define HAVE_POSIX_MEMALIGN
# endif
# ifdef __GNUC__
# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
# error "GCC version 4.2 or higher required"
# endif
/* https://gcc.gnu.org/onlinedocs/gcc-4.2.4/gcc/Other-Builtins.html */
# define HAVE___BUILTIN_CLZ 1
# define HAVE___BUILTIN_CLZLL 1
# define HAVE___BUILTIN_CTZ 1
# define HAVE___BUILTIN_EXPECT 1
# define HAVE___BUILTIN_FFS 1
# define HAVE___BUILTIN_FFSLL 1
# define HAVE___BUILTIN_POPCOUNT 1
# define HAVE___BUILTIN_POPCOUNTLL 1
/* https://gcc.gnu.org/onlinedocs/gcc-4.2.4/gcc/Function-Attributes.html */
# define HAVE_FUNC_ATTRIBUTE_FLATTEN 1
# define HAVE_FUNC_ATTRIBUTE_UNUSED 1
# define HAVE_FUNC_ATTRIBUTE_FORMAT 1
# define HAVE_FUNC_ATTRIBUTE_PACKED 1
# define HAVE_FUNC_ATTRIBUTE_ALIAS 1
# define HAVE_FUNC_ATTRIBUTE_NORETURN 1
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
/* https://gcc.gnu.org/onlinedocs/gcc-4.3.6/gcc/Other-Builtins.html */
# define HAVE___BUILTIN_BSWAP32 1
# define HAVE___BUILTIN_BSWAP64 1
# endif
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
# define HAVE___BUILTIN_UNREACHABLE 1
# endif
# endif /* __GNUC__ */
#endif /* HAVE_SCONS */
#endif /* _C99_COMPAT_H_ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment