Merge pull request #1349 from hadfl/fix

build fixes

build/apache/build-24.sh

@@ -68,6 +68,8 @@ CONFIGURE_OPTS="
     --enable-md
 "
 
+LDFLAGS[amd64]+=" -R$OPREFIX/${LIBDIRS[amd64]}"
+
 init
 download_source $PROG httpd $VER
 patch_source

build/graphviz/build.sh

@@ -41,6 +41,9 @@ XFORM_ARGS="
     -DPKGROOT=$PROG
 "
 
+# groff 1.23.0 has issues building the docs which we don't even package
+export GROFF=$USRBIN/true
+
 CONFIGURE_OPTS="
     --prefix=$PREFIX
     --disable-static

build/pg_extension/citus/build.sh

@@ -18,7 +18,7 @@
 
 PROG=citus
 PKG=ooce/database/postgresql-XX/citus
-VER=11.2.0
+VER=12.1.0
 SUMMARY="Citus PostgreSQL XX extension"
 DESC="Transforms PostgreSQL XX into a distributed database"
 
@@ -34,6 +34,8 @@ download_source $PROG v$VER
 patch_source
 
 for v in $PGVERSIONS; do
+    # citus 12 is not compatible with postgres 13
+    ((v <= 13)) && continue
     PREFIX=$OPREFIX/pgsql-$v
 
     # Make sure the right pg_config is used.

build/pg_extension/citus/files/ctf.ignore

@@ -2,3 +2,4 @@ ruleutils_12.c
 ruleutils_13.c
 ruleutils_14.c
 ruleutils_15.c
+ruleutils_16.c

build/pg_extension/citus/patches/series

@@ -1,3 +1,2 @@
 sys_stat.patch
 fix-build-in-zone.patch
-relationgetsmfr.patch

build/pg_extension/mysql_fdw/build.sh

@@ -12,13 +12,13 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../../lib/build.sh
 
 PROG=mysql_fdw
 PKG=ooce/database/postgresql-XX/mysql_fdw
-VER=2.9.0
+VER=2.9.1
 SUMMARY="MySQL PostgreSQL XX foreign data wrapper"
 DESC="Allow PostgreSQL XX to access data in a MySQL database"
 

doc/baseline

@@ -105,8 +105,8 @@ extra.omnios ooce/developer/subversion
 extra.omnios ooce/developer/valgrind
 extra.omnios ooce/developer/yasm
 extra.omnios ooce/developer/zig r
-extra.omnios ooce/developer/zig-09
 extra.omnios ooce/developer/zig-011
+extra.omnios ooce/developer/zig-09
 extra.omnios ooce/driver/fuse
 extra.omnios ooce/editor/emacs
 extra.omnios ooce/editor/helix
@@ -175,6 +175,7 @@ extra.omnios ooce/library/tiff
 extra.omnios ooce/library/unbound
 extra.omnios ooce/library/unistring
 extra.omnios ooce/multimedia/dav1d
+extra.omnios ooce/multimedia/dcraw
 extra.omnios ooce/multimedia/exif
 extra.omnios ooce/multimedia/ffmpeg
 extra.omnios ooce/multimedia/minidlna

doc/packages.md

@@ -43,8 +43,8 @@
 | ooce/database/postgresql-14	| 14.9		| https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-15	| 15.4		| https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-16	| 16.0		| https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg)
-| ooce/database/postgresql-XX/citus	| 11.2.0	| https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/database/postgresql-XX/mysql_fdw	| 2.9.0	| https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg)
+| ooce/database/postgresql-XX/citus	| 12.1.0	| https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg)
+| ooce/database/postgresql-XX/mysql_fdw	| 2.9.1	| https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-XX/pg_repack	| 1.4.8	| https://github.com/reorg/pg_repack/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/database/rrdtool		| 1.8.0		| https://github.com/oetiker/rrdtool-1.x/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/developer/autoconf-archive | 2023.02.20	| https://ftp.gnu.org/gnu/autoconf-archive/ | [omniosorg](https://github.com/omniosorg)