Skip to content

Commit 1e49344

Browse files
committed
chore: add meson support to build extension
Since meson is the PostgreSQL standard now to build, we add support for meson and make it the tool required to build. Closes #8 Signed-off-by: Jonathan Gonzalez V. <[email protected]>
1 parent 0c78b5f commit 1e49344

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

docker/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
55
set -eux; \
66
apt-get update; \
77
apt-get install -y --no-install-recommends \
8-
build-essential libcurl4-openssl-dev postgresql-server-dev-18; \
9-
apt-get clean; \
10-
rm -rf /var/lib/apt/lists/*
8+
build-essential \
9+
meson \
10+
libcurl4-openssl-dev \
11+
postgresql-server-dev-18; \
1112
WORKDIR /work
12-
COPY src/ ./src/
13-
RUN make -C src
13+
COPY . .
14+
RUN meson setup build && meson build -C build/
1415

1516
FROM ghcr.io/cloudnative-pg/postgresql:18-standard-trixie
1617
ARG DEBIAN_FRONTEND=noninteractive
@@ -25,4 +26,4 @@ COPY --chmod=0644 docker/certs/server.crt /usr/local/share/ca-certificates/kc-ro
2526
RUN update-ca-certificates
2627
ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
2728
USER postgres
28-
COPY --from=builder /work/src/kc_validator.so /usr/lib/postgresql/18/lib/
29+
COPY --from=builder /work/build/kc_validator.so /usr/lib/postgresql/18/lib/

meson.build

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
project('postgres-keycloak-oauth-validator', 'c')
2+
3+
pg_config = find_program('pg_config')
4+
includedir_server = run_command(pg_config, '--includedir-server', check: true).stdout().strip()
5+
postgres = dependency('libpq')
6+
libcurl = dependency('libcurl')
7+
8+
shared_module('kc_validator', 'src/kc_validator.c',
9+
dependencies: [postgres, libcurl],
10+
include_directories: [includedir_server],
11+
name_prefix: '')

src/Makefile

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)