Date: Sun, 19 May 2024 00:46:01 +0200
From: Ole Peder =?utf-8?Q?Brandtz=C3=A6g?= <olebra@samfundet.no>
To: Peter Eisentraut <peter@eisentraut.org>
Cc: Thomas Munro <thomas.munro@gmail.com>,
	pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: Re: Requiring LLVM 14+ in PostgreSQL 18
Message-ID: <20240518224601.gtisttjerylukjr5@samfundet.no>
References: <CA+hUKG+SOP-aR=YF_n0dtXGWeCy6x+Cn-RMWURU5ySQdmeKW1Q@mail.gmail.com>
 <CA+hUKGLXr0Rjz_6PQrNWe7Z-k7_G-MAHoh1DP+A-sxw0qpYEDQ@mail.gmail.com>
 <CA+hUKGLFNFMOPPME6mpkGeve0+6CRrZLMTKs+MmBGJp4vLcJ=A@mail.gmail.com>
 <5255e75e-5a66-41ac-99d3-1998283b86e6@eisentraut.org>
 <CA+hUKGL3EJ37xuj0813AfgwtxBSmfM_pwE8pSGGE5BeKSxCiZw@mail.gmail.com>
 <5a256041-2520-4082-8483-7f8c1e79fb88@eisentraut.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="cifehich6663p3qc"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <5a256041-2520-4082-8483-7f8c1e79fb88@eisentraut.org>
Archived-At: <https://www.postgresql.org/message-id/20240518224601.gtisttjerylukjr5%40samfundet.no>
Precedence: bulk


--cifehich6663p3qc
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

On Wed, May 15, 2024 at 07:20:09AM +0200, Peter Eisentraut wrote:
> Yes, let's get that v3-0001 patch into PG17.

Upon seeing this get committed in 4dd29b6833, I noticed that the docs
still advertise the llvm-config-$version search dance. That's still
correct for Meson-based builds since we use their config-tool machinery,
but no longer holds for configure-based builds. The attached patch
updates the docs accordingly.

-- 
Ole Peder Brandtzæg
In any case, these nights just ain't getting any easier
And who could judge us
For seeking comfort in the hazy counterfeit land of memory

--cifehich6663p3qc
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
	filename="0001-doc-remove-llvm-config-search-from-configure-doc.patch"

From 61dfbf5a252b53697cce17cd4885ecddb7665814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Peder=20Brandtz=C3=A6g?= <olebra@samfundet.no>
Date: Sun, 19 May 2024 00:29:09 +0200
Subject: [PATCH] doc: remove llvm-config search from configure documentation

As of 4dd29b6833, we no longer attempt to locate any other llvm-config
variant than plain llvm-config in configure-based builds; update the
documentation accordingly. (For Meson-based builds, we still use Meson's
LLVMDependencyConfigTool [0], which runs through a set of possible
suffixes [1], so no need to update the documentation there.)

[0]: https://github.com/mesonbuild/meson/blob/7d28ff29396f9d7043204de8ddc52226b9903811/mesonbuild/dependencies/dev.py#L184
[1]: https://github.com/mesonbuild/meson/blob/7d28ff29396f9d7043204de8ddc52226b9903811/mesonbuild/environment.py#L183
---
 doc/src/sgml/installation.sgml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 1b32d5ca62..19abec2c34 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -941,12 +941,9 @@ build-postgresql:
         <para>
          <command>llvm-config</command><indexterm><primary>llvm-config</primary></indexterm>
          will be used to find the required compilation options.
-         <command>llvm-config</command>, and then
-         <command>llvm-config-$major-$minor</command> for all supported
-         versions, will be searched for in your <envar>PATH</envar>.  If
-         that would not yield the desired program,
-         use <envar>LLVM_CONFIG</envar> to specify a path to the
-         correct <command>llvm-config</command>. For example
+         <command>llvm-config</command> will be searched for in your <envar>PATH</envar>.
+         If that would not yield the desired program, use <envar>LLVM_CONFIG</envar> to
+         specify a path to the correct <command>llvm-config</command>. For example
 <programlisting>
 ./configure ... --with-llvm LLVM_CONFIG='/path/to/llvm/bin/llvm-config'
 </programlisting>
-- 
2.43.0


--cifehich6663p3qc--