Skip to content

Commit 08e4e1a

Browse files
committed
fix: patch rum to compile for orioledb
1 parent ec37628 commit 08e4e1a

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

docker/orioledb/Dockerfile

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ RUN tar -xvf /tmp/pg_cron.tar.gz -C /tmp && \
184184
rm -rf /tmp/pg_cron.tar.gz
185185
# Build from source
186186
WORKDIR /tmp/pg_cron-${pg_cron_release}
187+
# error: redefinition of typedef 'snapshot_hook_type' is a C11 feature [-Werror,-Wtypedef-redefinition]
187188
RUN sed -i -e "s|-std=c99|-std=c11|g" Makefile
188189
RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \
189190
make -j$(nproc)
@@ -449,6 +450,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
449450
&& rm -rf /var/lib/apt/lists/*
450451
# Build from source
451452
WORKDIR /tmp/rum-${rum_release}
453+
RUN sed -i \
454+
# error: typedef redefinition with different types ('struct SortTuple' vs 'struct SortTuple')
455+
-e "183s|^|// |g" \
456+
-e "184s|^|// |g" \
457+
-e "185s|^|// |g" \
458+
-e "186s|^|// |g" \
459+
-e "187s|^|// |g" \
460+
-e "188s|^|// |g" \
461+
-e "189s|^|// |g" \
462+
# error: static declaration of 'tuplesort_begin_common' follows non-static declaration
463+
-e "621s|static ||g" \
464+
# error: static declaration of 'tuplesort_begin_common' follows non-static declaration
465+
-e "846s|static ||g" \
466+
# error: static declaration of 'tuplesort_gettuple_common' follows non-static declaration
467+
-e "2308s|static ||g" \
468+
src/tuplesort15.c
452469
ENV USE_PGXS=1
453470
RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \
454471
make -j$(nproc)
@@ -663,6 +680,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
663680
&& rm -rf /var/lib/apt/lists/*
664681
# Build from source
665682
WORKDIR /tmp/pg_repack-ver_${pg_repack_release}
683+
# Makefile:29: *** pg_repack requires PostgreSQL 9.4 or later. This is 3. Stop.
666684
RUN sed -i -e "s|904|3|g" Makefile
667685
ENV USE_PGXS=1
668686
RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \
@@ -765,7 +783,7 @@ COPY --from=wal2json-source /tmp/*.deb /tmp/
765783
COPY --from=plv8 /tmp/*.deb /tmp/
766784
COPY --from=pg_plan_filter-source /tmp/*.deb /tmp/
767785
COPY --from=pg_net-source /tmp/*.deb /tmp/
768-
# COPY --from=rum-source /tmp/*.deb /tmp/
786+
COPY --from=rum-source /tmp/*.deb /tmp/
769787
COPY --from=pgsodium-source /tmp/*.deb /tmp/
770788
COPY --from=pg_hashids-source /tmp/*.deb /tmp/
771789
COPY --from=pg_graphql /tmp/*.deb /tmp/

0 commit comments

Comments
 (0)