From f5983a6eedc9cdd9bd48cdcfcfd751dfdc814984 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 16 Jan 2020 19:34:02 +0100 Subject: [PATCH] docs: do not use definition-list for sub-topics The dl-tag isn't a neat tool for defining sub-headings, it's a semantic tool for defining definitions and their meaning. Let's insetad use normal sub-headings instead. To make the last few paragraphs stand out from the above, let's add a sub-heading for those as well. Reviewed-by: Eric Engestrom Part-of: --- docs/meson.html | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/docs/meson.html b/docs/meson.html index f2abc05c411..78507c1d39e 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -203,10 +203,7 @@ or greater. Older versions always use the microsoft compiler.

3. Advanced Usage

-
- -
Installation Location
-
+

Installation Location

Meson default to installing libGL.so in your system's main lib/ directory and DRI drivers to a dri/ subdirectory. @@ -228,10 +225,8 @@ to run/test the driver.

Meson also honors DESTDIR for installs.

-
-
Compiler Options
-
+

Compiler Options

Meson supports the common CFLAGS, CXXFLAGS, etc. environment variables but their use is discouraged because of the many caveats in using them. @@ -247,11 +242,9 @@ for C++ sources: 

 meson builddir/ -Dc_args=-fmax-errors=10 -Dcpp_args=-DMAGIC=123
-
-
Compiler Specification
-
+

Compiler Specification

Meson supports the standard CC and CXX environment variables for changing the default compiler. Note that Meson does not allow @@ -274,14 +267,12 @@ The default compilers depends on your operating system. Meson supports most of the popular compilers, a complete list is available here.

-
-
LLVM
-

Meson includes upstream logic to wrap llvm-config using its standard +

LLVM

+

Meson includes upstream logic to wrap llvm-config using its standard dependency interface. -

- -

+

+

As of meson 0.51.0 meson can use cmake to find llvm (the cmake finder was added in meson 0.49.0, but LLVM cannot be found until 0.51) Due to the way LLVM implements its cmake finder it will only find static libraries, it @@ -294,9 +285,8 @@ example: 

         meson builddir -Dcmake_module_path=/home/user/mycmake/prefix
-
-

+

As of meson 0.49.0 meson also has the concept of a "native file", these files provide information about the native build environment (as opposed @@ -315,9 +305,8 @@ Then configure meson: 

     meson builddir/ --native-file custom-llvm.ini
-
-

+

Meson < 0.49 doesn't support native files, so to specify a custom llvm-config you need to modify your $PATH (or %PATH% on windows), which will be searched for @@ -327,9 +316,8 @@ and llvm-config-$version: 

 PATH=/path/to/folder/with/llvm-config:$PATH meson build
-
-

+

For selecting llvm-config for cross compiling a "cross file" should be used. It uses the same format as the native file above: @@ -351,9 +339,8 @@ should be used. It uses the same format as the native file above: See the Cross Compilation section for more information. -

-

On windows (and in other cases), using llvm-config or cmake may be +

On windows (and in other cases), using llvm-config or cmake may be either undesirable or impossible. Meson's solution for this is a wrap, in this case a "binary wrap". Follow the steps below:

@@ -418,18 +405,16 @@ irbuilder_h = files('include/llvm/IR/IRBuilder.h') workarounds for the wrong version of LLVM might be used resulting in build failures.

-
-
PKG_CONFIG_PATH
-

The +

PKG_CONFIG_PATH

+

The pkg-config utility is a hard requirement for configuring and building Mesa on Unix-like systems. It is used to search for external libraries on the system. This environment variable is used to control the search path for pkg-config. For instance, setting PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig will search for package metadata in /usr/X11R6 before the standard directories.

-
-
+

Options

One of the oddities of meson is that some options are different when passed to the meson than to meson configure. These options are -- 2.30.2