sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PLIST problems when building with LLVM but without GSSAPI or OPENSSL.

Browse source 
PR:		241053, 241166
Submitted by:	Artyom Davidov
This commit is contained in:
Palle Girgensohn 2019-10-17 14:12:49 +00:00
parent f6c0d0b612
commit 997ef94e33
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=514661
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
databases/postgresql12-server/Makefile
View file

@ -218,9 +218,11 @@ CONFIGURE_ARGS+=--with-gssapi
# so configure's -lgssapi_krb5 won't go. # so configure's -lgssapi_krb5 won't go.
LDFLAGS+= -lgssapi LDFLAGS+= -lgssapi
LDFLAGS_SL+= -lgssapi LDFLAGS_SL+= -lgssapi
PLIST_SUB+= GSSAPI=""
.endif .endif
.else .else
CONFIGURE_ARGS+=--without-gssapi CONFIGURE_ARGS+=--without-gssapi
PLIST_SUB+= GSSAPI="@comment "
.endif .endif
. if ${PORT_OPTIONS:MMIT_KRB5} . if ${PORT_OPTIONS:MMIT_KRB5}
@ -239,6 +241,12 @@ LIB_DEPENDS+= libkrb5.so.3:security/krb5
CONFIGURE_ARGS+=--with-krb5 CONFIGURE_ARGS+=--with-krb5
. endif . endif
. if ${PORT_OPTIONS:MSSL}
PLIST_SUB+= SSL=""
. else
PLIST_SUB+= SSL="@comment "
. endif
.endif # !SLAVE_ONLY .endif # !SLAVE_ONLY
# For testing files in FILESDIR # For testing files in FILESDIR

6
databases/postgresql12-server/pkg-plist-server
View file

@ -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-scram.bc
%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.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-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-common.bc
%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc %%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.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/be-secure.bc
%%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc
%%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc %%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc