Date: Wed, 7 Oct 2020 20:53:25 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551663 - head/databases/postgresql13-server Message-ID: <202010072053.097KrPZ2070026@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Wed Oct 7 20:53:25 2020 New Revision: 551663 URL: https://svnweb.freebsd.org/changeset/ports/551663 Log: databases/postgresql13-server: fix build on clang architectures Move LLVM option configuration after including bsd.port.options.mk. Reported by: kib@ Modified: head/databases/postgresql13-server/Makefile Modified: head/databases/postgresql13-server/Makefile ============================================================================== --- head/databases/postgresql13-server/Makefile Wed Oct 7 20:31:25 2020 (r551662) +++ head/databases/postgresql13-server/Makefile Wed Oct 7 20:53:25 2020 (r551663) @@ -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 @@ -237,6 +232,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010072053.097KrPZ2070026>