diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-10-07 20:53:25 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-10-07 20:53:25 +0000 |
| commit | 051046aec9e6a0706e13ad72fe1bbe684314d0c6 (patch) | |
| tree | 832ae9687455540786b088ff0cc8c9d2169c46d9 /databases/postgresql13-server | |
| parent | 883764405cf9b65b88e1a51351be03eefa4a529a (diff) | |
| download | ports-051046aec9e6a0706e13ad72fe1bbe684314d0c6.tar.gz ports-051046aec9e6a0706e13ad72fe1bbe684314d0c6.zip | |
databases/postgresql13-server: fix build on clang architectures
Move LLVM option configuration after including bsd.port.options.mk.
Reported by: kib@
Notes
Notes:
svn path=/head/; revision=551663
Diffstat (limited to 'databases/postgresql13-server')
| -rw-r--r-- | databases/postgresql13-server/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile index 9686f1e5b527..3651271e429d 100644 --- a/databases/postgresql13-server/Makefile +++ b/databases/postgresql13-server/Makefile @@ -99,11 +99,6 @@ DTRACE_INSTALL_TARGET= install .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 OPTIONS_DEFINE+= 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 .endif @@ -238,6 +233,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} |