Skip to content

Commit

Permalink
build postgresql-16 only for r151044 and later releases
Browse files Browse the repository at this point in the history
  • Loading branch information
hadfl committed Sep 23, 2023
1 parent 2dd467d commit e44aaca
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion build/meta/extra-build-tools.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ depend fmri=ooce/library/postgresql-12 type=require
depend fmri=ooce/library/postgresql-13 type=require
depend fmri=ooce/library/postgresql-14 type=require
depend fmri=ooce/library/postgresql-15 type=require
depend fmri=ooce/library/postgresql-16 type=require
depend fmri=ooce/library/security/libsasl2 type=require
depend fmri=ooce/library/serf type=require
depend fmri=ooce/library/slang type=require
Expand Down Expand Up @@ -97,6 +96,10 @@ depend fmri=ooce/developer/clang-14 type=conditional \
depend fmri=ooce/developer/llvm-15 type=conditional \
predicate=release/[email protected]

# Added postgresql 16 from r151044 onwards
depend fmri=ooce/library/postgresql-16 type=conditional \
predicate=release/[email protected]

# clang 15 is the default clang compiler from r151045 onwards
depend fmri=ooce/developer/clang-15 type=conditional \
predicate=release/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion build/pg_extension/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.

PGVERSIONS="13 14 15 16"
PGVERSIONS="13 14 15"
test_relver '>=' 151044 && PGVERSIONS+=" 16"

for v in $PGVERSIONS; do
BUILD_DEPENDS_IPS+=" ooce/library/postgresql-$v"
Expand Down
2 changes: 2 additions & 0 deletions build/postgresql/build-16.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ VER=16.0
SUMMARY="PostgreSQL 16"
DESC="The World's Most Advanced Open Source Relational Database"

min_rel 151044

SKIP_LICENCES=postgresql

# We want to populate the clang-related environment variables
Expand Down
4 changes: 2 additions & 2 deletions tools/audit
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ audit()
*/clang-15:|*/llvm-15:) [ $r -lt 151043 ] || ok=0 ;;
# clang/llvm-16 are not published until r151045
*/clang-16:|*/llvm-16:) [ $r -lt 151045 ] || ok=0 ;;
# qemu and tailscale are not published until r151044
*/qemu:|*/tailscale:) [ $r -lt 151044 ] || ok=0 ;;
# qemu, tailscale and pgsql 16 are not published until r151044
*/qemu:|*/tailscale:|*/postgresql-16:) [ $r -lt 151044 ] || ok=0 ;;
# helix, mariadb-1011 and hunspell
# are not published until r151042
*/helix:|*/mariadb-1011:|*/hunspell:)
Expand Down

0 comments on commit e44aaca

Please sign in to comment.