From 4f236c8529ce583536ebb7dd27913a612e4e1a42 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 9 Nov 2023 18:29:40 -0800 Subject: [PATCH 1/4] Clarify `LIBRARY_*` & `SCRIPT` use `PREFIX` Saying `` now implies `BUILD_PREFIX`, which isn't the case. AFAIK these have always been constructed based on `PREFIX`, which is the host environment. Guessing this is just leftover verbiage that needs a refresh. --- docs/source/user-guide/environment-variables.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/user-guide/environment-variables.rst b/docs/source/user-guide/environment-variables.rst index 98f99fe15d..887c18b71f 100644 --- a/docs/source/user-guide/environment-variables.rst +++ b/docs/source/user-guide/environment-variables.rst @@ -142,15 +142,15 @@ listed in the following table are defined only on Windows. - Same as PREFIX, but as a Unix-style path, such as ``/cygdrive/c/path/to/prefix``. * - LIBRARY_BIN - - ``\Library\bin``. + - ``%PREFIX%\Library\bin``. * - LIBRARY_INC - - ``\Library\include``. + - ``%PREFIX%\Library\include``. * - LIBRARY_LIB - - ``\Library\lib``. + - ``%PREFIX%\Library\lib``. * - LIBRARY_PREFIX - - ``\Library``. + - ``%PREFIX%\Library``. * - SCRIPTS - - ``\Scripts``. + - ``%PREFIX%\Scripts``. * - VS_MAJOR - The major version number of the Visual Studio version activated within the build, such as ``9``. From abde8a871fe85de9b594d590b28fd455696817ff Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 9 Nov 2023 18:31:52 -0800 Subject: [PATCH 2/4] Clarify `LD_RUN_PATH` too This also uses `$PREFIX`. So correct it too. --- docs/source/user-guide/environment-variables.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/user-guide/environment-variables.rst b/docs/source/user-guide/environment-variables.rst index 887c18b71f..9ef714b36d 100644 --- a/docs/source/user-guide/environment-variables.rst +++ b/docs/source/user-guide/environment-variables.rst @@ -196,7 +196,7 @@ defined only on Linux. :widths: 20 80 * - LD_RUN_PATH - - ``/lib``. + - ``$PREFIX/lib``. .. _git-env: From e2f4c63755a317d68d0e616d8361f0ecc3f82692 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 9 Nov 2023 18:53:02 -0800 Subject: [PATCH 3/4] Use `host prefix` in descriptions --- docs/source/user-guide/environment-variables.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/user-guide/environment-variables.rst b/docs/source/user-guide/environment-variables.rst index 9ef714b36d..8bbeb56ae3 100644 --- a/docs/source/user-guide/environment-variables.rst +++ b/docs/source/user-guide/environment-variables.rst @@ -92,7 +92,7 @@ inherited from the shell environment in which you invoke - Inherited from your shell environment and augmented with ``$PREFIX/bin``. * - PREFIX - - Build prefix to which the build script should install. + - Host prefix to which the build script should install. * - PKG_BUILDNUM - Build number of the package being built. * - PKG_NAME @@ -110,11 +110,11 @@ inherited from the shell environment in which you invoke is installed only in the host prefix when it is listed as a host requirement. * - PY3K - - ``1`` when Python 3 is installed in the build prefix, + - ``1`` when Python 3 is installed in the host prefix, otherwise ``0``. * - R - - Path to the R executable in the build prefix. R is only - installed in the build prefix when it is listed as a build + - Path to the R executable in the host prefix. R is only + installed in the host prefix when it is listed as a build requirement. * - RECIPE_DIR - Directory of the recipe. @@ -132,7 +132,7 @@ inherited from the shell environment in which you invoke Unix-style packages on Windows, which are usually statically linked to executables, are built in a special ``Library`` -directory under the build prefix. The environment variables +directory under the host prefix. The environment variables listed in the following table are defined only on Windows. .. list-table:: From b7abc9856f40ad09fc4a9faa101e132790e03bf7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 9 Nov 2023 19:02:03 -0800 Subject: [PATCH 4/4] Add `BUILD_PREFIX` to environment variables --- docs/source/user-guide/environment-variables.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/user-guide/environment-variables.rst b/docs/source/user-guide/environment-variables.rst index 8bbeb56ae3..d925040c17 100644 --- a/docs/source/user-guide/environment-variables.rst +++ b/docs/source/user-guide/environment-variables.rst @@ -53,6 +53,8 @@ inherited from the shell environment in which you invoke environment variable and defaults to the architecture the interpreter running conda was compiled with. + * - BUILD_PREFIX + - Build prefix where command line tools are installed. * - CMAKE_GENERATOR - The CMake generator string for the current build environment. On Linux systems, this is always