Skip to content

Commit 88be90d

Browse files
Merge pull request #49 from rustprooflabs/fix-pg16
Fix Postgres 16 build
2 parents 2a2de43 + aff018e commit 88be90d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build/docker/pgdd-ubuntu-jammy/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ RUN useradd -m ${USER} --uid=${UID}
1111

1212

1313
ARG DEBIAN_FRONTEND=noninteractive
14+
1415
RUN apt-get update && apt-get upgrade -y \
1516
&& apt-get install -y make wget curl gnupg git postgresql-common
1617

1718
RUN sh /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
1819

1920
RUN apt-get update && apt-get upgrade -y --fix-missing
2021
RUN apt-get install -y --fix-missing \
21-
clang-14 llvm-14 clang libz-dev strace pkg-config \
22+
clang libz-dev strace pkg-config \
2223
libxml2 libxml2-dev libreadline8 libreadline-dev \
2324
flex bison libbison-dev build-essential \
24-
zlib1g-dev libxslt-dev libssl-dev libxml2-utils xsltproc libgss-dev \
25+
zlib1g-dev libxslt-dev libssl-dev \
26+
libxml2-utils xsltproc libgss-dev \
2527
libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
2628
libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
2729
ruby ruby-dev rubygems \

build/package.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ echo "PgDD Building for: ${OSNAME}-${VERSION}"
4545
PG_CONFIG_DIR=$(dirname $(grep ${PG_VER} ~/.pgrx/config.toml | cut -f2 -d= | cut -f2 -d\"))
4646
export PATH=${PG_CONFIG_DIR}:${PATH}
4747

48+
# Jubilee's suggestion fixed the issue:
49+
# https://github.com/pgcentralfoundation/pgrx/issues/1298#issuecomment-1806688762
50+
export PGRX_BINDGEN_NO_DETECT_INCLUDES=please
51+
4852
echo " Packaging pgrx"
4953
cargo pgrx package || exit $?
5054

0 commit comments

Comments
 (0)