cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r551634 r551663 r551702 r552356

Browse Source 
databases/postgresql13-server: fix build on GCC architectures

Add the previously removed disabling of LLVM when it's not in base.

databases/postgresql13-server: fix build on clang architectures

Move LLVM option configuration after including bsd.port.options.mk.

Reported by:	kib@

databases/postgresql13-server: make LLVM option unselectable

This will still keep this port and its slaves buildable on the package builder on powerpc64, and I doubt anyone uses it on mips*.

Reported by:	kib@, adamw@

Fix options breakage from r551702.

Make LLVM option work again on everything but powerpc64.

PR:		250346
Submitted by:	Christian Ullrich

Approved by:	portmgr (fix build blanket)
This commit is contained in:
Piotr Kubaj 2020-10-21 19:07:17 +00:00
parent 25e20a09d4
commit 88295b7f5a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=552883
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
databases/postgresql13-server/Makefile
View File

@ -100,13 +100,8 @@ DTRACE_INSTALL_TARGET= install
OPTIONS_DEFINE+= LLVM
OPTIONS_DEFAULT+= LLVM
LLVM_DESC= Build with support for JIT-compiling expressions
LLVM_CONFIGURE_WITH= llvm
LLVM_BUILD_DEPENDS= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION}
LLVM_BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
LLVM_RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
LLVM_CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION}
#OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
#OPTIONS_DEFAULT_clang= LLVM
OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
OPTIONS_EXCLUDE_powerpc64_12= LLVM
.endif
.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10
@ -239,6 +234,14 @@ CONFIGURE_ARGS+=--with-krb5
# For testing files in FILESDIR
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MLLVM}
CONFIGURE_ARGS+= --with-llvm
BUILD_DEPENDS+= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION}
BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION}
.endif
# sync LLVM to the preferred compiler if possible
# or else use a lower version compiler that is compatible
.if ${COMPILER_VERSION} > ${LLVM_DEFAULT}