Обсуждение: [PATCH] src/interfaces/libpq/Makefile: fix pkg-config without openssl

Поиск
Список
Период
Сортировка

[PATCH] src/interfaces/libpq/Makefile: fix pkg-config without openssl

От
Fabrice Fontaine
Дата:
Do not add openssl dependencies to libpq pkg-config file if openssl is
disabled to avoid the following build failure with libdbi-drivers raised
since commit beff361bc1edc24ee5f8b2073a1e5e4c92ea66eb:

configure: error: Package requirements (libpq) were not met:

Package 'libssl', required by 'libpq', not found
Package 'libcrypto', required by 'libpq', not found

Fixes:
 - http://autobuild.buildroot.org/results/415cb61a58b928a42623ed90b0b60c59032f0a4e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 src/interfaces/libpq/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 89bf5e0126..b5fd72a4ac 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -95,7 +95,9 @@ SHLIB_PREREQS = submake-libpgport
 
 SHLIB_EXPORTS = exports.txt
 
+ifeq ($(with_ssl),openssl)
 PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto
+endif
 
 all: all-lib libpq-refs-stamp
 
-- 
2.35.1




Re: [PATCH] src/interfaces/libpq/Makefile: fix pkg-config without openssl

От
Daniel Gustafsson
Дата:
> On 31 Mar 2022, at 18:37, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> +ifeq ($(with_ssl),openssl)
> PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto
> +endif

That seems reasonable, is there any reason why the referenced commit didn't do
that?

--
Daniel Gustafsson        https://vmware.com/




Re: [PATCH] src/interfaces/libpq/Makefile: fix pkg-config without openssl

От
Tom Lane
Дата:
Daniel Gustafsson <daniel@yesql.se> writes:
>> On 31 Mar 2022, at 18:37, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>> +ifeq ($(with_ssl),openssl)
>> PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto
>> +endif

> That seems reasonable, is there any reason why the referenced commit didn't do
> that?

Looks like a clear oversight to me, but maybe Peter will
think differently.

            regards, tom lane



Re: [PATCH] src/interfaces/libpq/Makefile: fix pkg-config without openssl

От
Peter Eisentraut
Дата:
On 31.03.22 18:37, Fabrice Fontaine wrote:
> Do not add openssl dependencies to libpq pkg-config file if openssl is
> disabled to avoid the following build failure with libdbi-drivers raised
> since commit beff361bc1edc24ee5f8b2073a1e5e4c92ea66eb:
> 
> configure: error: Package requirements (libpq) were not met:
> 
> Package 'libssl', required by 'libpq', not found
> Package 'libcrypto', required by 'libpq', not found
> 
> Fixes:
>   -http://autobuild.buildroot.org/results/415cb61a58b928a42623ed90b0b60c59032f0a4e
> 
> Signed-off-by: Fabrice Fontaine<fontaine.fabrice@gmail.com>

Fixed, thanks.