Date: Mon, 13 Mar 2023 13:25:44 -0700
From: Nathan Bossart <nathandbossart@gmail.com>
To: Andres Freund <andres@anarazel.de>
Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>,
	Daniel Gustafsson <daniel@yesql.se>,
	Nazir Bilal Yavuz <byavuz81@gmail.com>,
	PostgreSQL Hackers <pgsql-hackers@postgresql.org>
Subject: Re: meson: Non-feature feature options
Message-ID: <20230313202544.GA373446@nathanxps13>
References: <CAN55FZ3JkWJRgBOvaB0VDYg1F+v3QMg4vwVae1gpQ+mnsYc-3g@mail.gmail.com>
 <b695b531-eb98-87f1-45c8-13f2ed3973a8@enterprisedb.com>
 <CAN55FZ1UFQfKifUV=oAf+WseCxD0Kq3g_AvWEEety9VneMvzvw@mail.gmail.com>
 <0fff0827-c1f5-d29c-2ee3-dc8c871176bf@enterprisedb.com>
 <CAN55FZ1=-jb38PujfcMWjAH8vDTYoxrgvz_oha_p+q0quMtzCw@mail.gmail.com>
 <9df9067d-5651-2d3e-e838-9e5d273f5524@enterprisedb.com>
 <5250E85B-4A97-4DA1-8900-7DCDE925441A@yesql.se>
 <6d3310fb-50e3-34d8-fe10-8dd8c4ffdf23@enterprisedb.com>
 <20230313180432.GA246741@nathanxps13>
 <20230313201331.xvbhzh5fufs6gxmn@awork3.anarazel.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230313201331.xvbhzh5fufs6gxmn@awork3.anarazel.de>
Archived-At: <https://www.postgresql.org/message-id/20230313202544.GA373446%40nathanxps13>
Precedence: bulk

On Mon, Mar 13, 2023 at 01:13:31PM -0700, Andres Freund wrote:
> On 2023-03-13 11:04:32 -0700, Nathan Bossart wrote:
>> I noticed that after 6a30027, if you don't have the OpenSSL headers
>> installed, 'meson setup' will fail:
>> 
>> 	meson.build:1195:4: ERROR: C header 'openssl/ssl.h' not found
>> 
>> Shouldn't "auto" cause Postgres to be built without OpenSSL if the required
>> headers are not present?
> 
> Yea. I found another thing: When dependency() found something, but the headers
> weren't present, ssl_int wouldn't exist.
> 
> Maybe something like the attached?

>      ssl_lib = cc.find_library('ssl',
>        dirs: test_lib_d,
>        header_include_directories: postgres_inc,
> -      has_headers: ['openssl/ssl.h', 'openssl/err.h'])
> +      has_headers: ['openssl/ssl.h', 'openssl/err.h'],
> +      required: openssl_required)
>      crypto_lib = cc.find_library('crypto',
>        dirs: test_lib_d,
> -      header_include_directories: postgres_inc)
> -    ssl_int = [ssl_lib, crypto_lib]
> -
> -    ssl = declare_dependency(dependencies: ssl_int,
> -                             include_directories: postgres_inc)
> +      required: openssl_required)
> +    if ssl_lib.found() and crypto_lib.found()
> +      ssl_int = [ssl_lib, crypto_lib]
> +      ssl = declare_dependency(dependencies: ssl_int, include_directories: postgres_inc)
> +    endif

I was just about to post a patch to set "required" like you have for
ssl_lib and crypto_lib.  It seemed to work alright without the 'if
ssl_lib.found() and crypto_lib.found()' line, but I haven't worked with
these meson files very much, so what you have is probably better form.

-- 
Nathan Bossart
Amazon Web Services: https://aws.amazon.com