FreeBSD Bugzilla – Attachment 224462 Details for
Bug 250824
databases/postgresql13-server: incorrect checking of llvm versions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix COMPILER_VERSION uses
pgsql.diff (text/plain), 3.10 KB, created by
Jung-uk Kim
on 2021-04-27 03:17:56 UTC
(
hide
)
Description:
Fix COMPILER_VERSION uses
Filename:
MIME Type:
Creator:
Jung-uk Kim
Created:
2021-04-27 03:17:56 UTC
Size:
3.10 KB
patch
obsolete
>diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile >index 516bc79d9627..13da43fb623f 100644 >--- a/databases/postgresql11-server/Makefile >+++ b/databases/postgresql11-server/Makefile >@@ -3,7 +3,7 @@ > DISTVERSION?= 11.11 > # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and > # not their own. Probably best to keep it at ?=0 when reset here too. >-PORTREVISION?= 1 >+PORTREVISION?= 2 > > MAINTAINER?= pgsql@FreeBSD.org > >diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile >index a47f1cca3b23..e18b8dd2c01f 100644 >--- a/databases/postgresql12-server/Makefile >+++ b/databases/postgresql12-server/Makefile >@@ -3,7 +3,7 @@ > DISTVERSION?= 12.6 > # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and > # not their own. Probably best to keep it at ?=0 when reset here too. >-PORTREVISION?= 1 >+PORTREVISION?= 2 > > MAINTAINER?= pgsql@FreeBSD.org > >diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile >index 4305a5ed4d55..712c57c91664 100644 >--- a/databases/postgresql13-server/Makefile >+++ b/databases/postgresql13-server/Makefile >@@ -4,7 +4,7 @@ PORTNAME?= postgresql > DISTVERSION?= 13.2 > # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and > # not their own. Probably best to keep it at ?=0 when reset here too. >-PORTREVISION?= 1 >+PORTREVISION?= 2 > CATEGORIES?= databases > MASTER_SITES= PGSQL/source/v${DISTVERSION} > PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} >@@ -240,26 +240,39 @@ RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} > CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} > .endif > >+# Convert LLVM_DEFAULT to COMPILER_VERSION format to make it >+# suitable for version comparison. >+.if ${LLVM_DEFAULT} >= 70 && ${LLVM_DEFAULT} <= 90 >+LLVM_DEFAULT_VERSION= ${LLVM_DEFAULT} >+.else >+LLVM_DEFAULT_VERSION= ${LLVM_DEFAULT}0 >+.endif >+ >+# Convert COMPILER_VERSION to LLVM_DEFAULT format to make it >+# suitable for LLVM port name. >+# All supported FreeBSD versions have Clang 10.0.1 or later. >+LLVM_PORT_SUFFIX= ${COMPILER_VERSION:C/.$//} >+ > # sync LLVM to the preferred compiler if possible > # or else use a lower version compiler that is compatible >-.if ${COMPILER_VERSION} > ${LLVM_DEFAULT} >+.if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION} > # Highest LLVM version in ports: >-. if ${COMPILER_VERSION} <= 11 >-PG_LLVM_VERSION=${COMPILER_VERSION} >-PG_COMPILER_VERSION=${COMPILER_VERSION} >+. if ${LLVM_PORT_SUFFIX} <= 11 >+PG_LLVM_VERSION=${LLVM_PORT_SUFFIX} >+PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} > . else > PG_LLVM_VERSION=11 > PG_COMPILER_VERSION=11 > . endif > .else >-PG_COMPILER_VERSION=${COMPILER_VERSION} > PG_LLVM_VERSION=${LLVM_DEFAULT} >+PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} > .endif > > .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 > . if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} > INSTALL_DIRS+= src/backend/jit/llvm >-. if ${COMPILER_VERSION} != ${PG_COMPILER_VERSION} >+. if ${LLVM_PORT_SUFFIX} != ${PG_COMPILER_VERSION} > LLVM_CONFIGURE_ARGS?= CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION} > . endif > . endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 250824
:
221794
| 224462