Skip to content

Commit

Permalink
Merge pull request #49 from rustprooflabs/fix-pg16
Browse files Browse the repository at this point in the history
Fix Postgres 16 build
  • Loading branch information
rustprooflabs authored Nov 25, 2023
2 parents 2a2de43 + aff018e commit 88be90d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions build/docker/pgdd-ubuntu-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ RUN useradd -m ${USER} --uid=${UID}


ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get upgrade -y \
&& apt-get install -y make wget curl gnupg git postgresql-common

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

RUN apt-get update && apt-get upgrade -y --fix-missing
RUN apt-get install -y --fix-missing \
clang-14 llvm-14 clang libz-dev strace pkg-config \
clang libz-dev strace pkg-config \
libxml2 libxml2-dev libreadline8 libreadline-dev \
flex bison libbison-dev build-essential \
zlib1g-dev libxslt-dev libssl-dev libxml2-utils xsltproc libgss-dev \
zlib1g-dev libxslt-dev libssl-dev \
libxml2-utils xsltproc libgss-dev \
libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
ruby ruby-dev rubygems \
Expand Down
4 changes: 4 additions & 0 deletions build/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ echo "PgDD Building for: ${OSNAME}-${VERSION}"
PG_CONFIG_DIR=$(dirname $(grep ${PG_VER} ~/.pgrx/config.toml | cut -f2 -d= | cut -f2 -d\"))
export PATH=${PG_CONFIG_DIR}:${PATH}

# Jubilee's suggestion fixed the issue:
# https://github.com/pgcentralfoundation/pgrx/issues/1298#issuecomment-1806688762
export PGRX_BINDGEN_NO_DETECT_INCLUDES=please

echo " Packaging pgrx"
cargo pgrx package || exit $?

Expand Down

0 comments on commit 88be90d

Please sign in to comment.