From 997ef94e331dadc26e85bf9874f75a79cedfdc5a Mon Sep 17 00:00:00 2001 From: Palle Girgensohn Date: Thu, 17 Oct 2019 14:12:49 +0000 Subject: [PATCH] Fix PLIST problems when building with LLVM but without GSSAPI or OPENSSL. PR: 241053, 241166 Submitted by: Artyom Davidov --- databases/postgresql12-server/Makefile | 8 ++++++++ databases/postgresql12-server/pkg-plist-server | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index dae3baef850a..429a295822fe 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -218,9 +218,11 @@ CONFIGURE_ARGS+=--with-gssapi # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi +PLIST_SUB+= GSSAPI="" .endif .else CONFIGURE_ARGS+=--without-gssapi +PLIST_SUB+= GSSAPI="@comment " .endif . if ${PORT_OPTIONS:MMIT_KRB5} @@ -239,6 +241,12 @@ LIB_DEPENDS+= libkrb5.so.3:security/krb5 CONFIGURE_ARGS+=--with-krb5 . endif +. if ${PORT_OPTIONS:MSSL} +PLIST_SUB+= SSL="" +. else +PLIST_SUB+= SSL="@comment " +. endif + .endif # !SLAVE_ONLY # For testing files in FILESDIR diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server index 7c44dd06faa2..0a5044080edb 100644 --- a/databases/postgresql12-server/pkg-plist-server +++ b/databases/postgresql12-server/pkg-plist-server @@ -338,10 +338,10 @@ lib/postgresql/utf8_and_win.so %%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc -%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc +%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc -%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc -%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc +%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc +%%LLVM%%%%SSL%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc