=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 03:25:32 UTC 2026 On branch cf/6056 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-meson-Fix-libpq-header-include-order.patch === Applying: meson: Fix libpq header include order. Using index info to reconstruct a base tree... M contrib/dblink/meson.build M contrib/oid2name/meson.build M contrib/postgres_fdw/meson.build M contrib/vacuumlo/meson.build M src/backend/replication/libpqwalreceiver/meson.build M src/bin/initdb/meson.build M src/bin/pg_amcheck/meson.build M src/bin/pg_basebackup/meson.build M src/bin/pg_ctl/meson.build M src/bin/pg_dump/meson.build M src/bin/pg_rewind/meson.build M src/bin/pg_upgrade/meson.build M src/bin/pg_verifybackup/meson.build M src/bin/pgbench/meson.build M src/bin/psql/meson.build M src/bin/scripts/meson.build M src/fe_utils/meson.build M src/interfaces/ecpg/ecpglib/meson.build M src/interfaces/ecpg/include/meson.build M src/interfaces/ecpg/test/meson.build M src/interfaces/ecpg/test/thread/meson.build M src/interfaces/libpq/test/meson.build M src/test/isolation/meson.build M src/test/modules/libpq_pipeline/meson.build M src/test/modules/oauth_validator/meson.build M src/test/modules/test_int128/meson.build M src/test/modules/test_json_parser/meson.build M src/test/regress/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/regress/meson.build Auto-merging src/test/modules/test_json_parser/meson.build Auto-merging src/test/modules/test_int128/meson.build Auto-merging src/test/modules/oauth_validator/meson.build Auto-merging src/test/modules/libpq_pipeline/meson.build Auto-merging src/test/isolation/meson.build Auto-merging src/interfaces/libpq/test/meson.build Auto-merging src/interfaces/ecpg/test/thread/meson.build Auto-merging src/interfaces/ecpg/test/meson.build Auto-merging src/interfaces/ecpg/include/meson.build Auto-merging src/interfaces/ecpg/ecpglib/meson.build Auto-merging src/fe_utils/meson.build Auto-merging src/bin/scripts/meson.build Auto-merging src/bin/psql/meson.build Auto-merging src/bin/pgbench/meson.build Auto-merging src/bin/pg_verifybackup/meson.build Auto-merging src/bin/pg_upgrade/meson.build Auto-merging src/bin/pg_rewind/meson.build Auto-merging src/bin/pg_dump/meson.build Auto-merging src/bin/pg_ctl/meson.build Auto-merging src/bin/pg_basebackup/meson.build Auto-merging src/bin/pg_amcheck/meson.build Auto-merging src/bin/initdb/meson.build Auto-merging src/backend/replication/libpqwalreceiver/meson.build Auto-merging contrib/vacuumlo/meson.build Auto-merging contrib/postgres_fdw/meson.build Auto-merging contrib/oid2name/meson.build Auto-merging contrib/dblink/meson.build === using 'git am' to apply patch ./v4-0002-ci-Test-include-path-order-with-canary-libpq-fe.h.patch === Applying: ci: Test include path order with canary libpq-fe.h. Using index info to reconstruct a base tree... M .cirrus.tasks.yml Falling back to patching base and 3-way merge... Auto-merging .cirrus.tasks.yml CONFLICT (content): Merge conflict in .cirrus.tasks.yml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ci: Test include path order with canary libpq-fe.h. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v4-0002-ci-Test-include-path-order-with-canary-libpq-fe.h.patch === patching file .cirrus.tasks.yml Hunk #1 succeeded at 431 (offset 7 lines). Hunk #2 FAILED at 494. Hunk #3 succeeded at 525 (offset 6 lines). Hunk #4 FAILED at 543. Hunk #5 succeeded at 563 with fuzz 1 (offset 8 lines). Hunk #6 succeeded at 578 with fuzz 1 (offset 10 lines). Hunk #7 FAILED at 578. 3 out of 7 hunks FAILED -- saving rejects to file .cirrus.tasks.yml.rej Unstaged changes after reset: M .cirrus.tasks.yml Removing .cirrus.tasks.yml.rej === using 'git apply' to apply patch ./v4-0002-ci-Test-include-path-order-with-canary-libpq-fe.h.patch === Applied patch to '.cirrus.tasks.yml' with conflicts. U .cirrus.tasks.yml diff --cc .cirrus.tasks.yml index a22cef063f3,3df6de6acd9..00000000000 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@@ -502,7 -511,8 +516,12 @@@ task # - Uses address sanitizer, sanitizer failures are typically printed in # the server log # - Configures postgres with a small segment size ++<<<<<<< ours + - name: Linux - Debian Trixie - Autoconf ++======= + # - Poisoned headers in search path + - name: Linux - Debian Bookworm - Autoconf ++>>>>>>> theirs env: SANITIZER_FLAGS: -fsanitize=address @@@ -547,7 -556,8 +567,12 @@@ # - Test both 64bit and 32 bit builds # - uses io_method=io_uring # - Uses meson feature autodetection ++<<<<<<< ours + - name: Linux - Debian Trixie - Meson ++======= + # - Poisoned headers in search path + - name: Linux - Debian Bookworm - Meson ++>>>>>>> theirs env: CCACHE_MAXSIZE: "400M" # tests two different builds @@@ -557,9 -567,9 +582,10 @@@ configure_script: | su postgres <<-EOF + set -e meson setup \ ${MESON_COMMON_PG_CONFIG_ARGS} \ + -Dextra_include_dirs="${POISONED_HEADERS}" \ --buildtype=debug \ ${LINUX_MESON_FEATURES} -Dllvm=enabled \ build @@@ -569,14 -579,13 +595,15 @@@ # locally. configure_32_script: | su postgres <<-EOF + set -e export CC='ccache gcc -m32' + export CXX='ccache g++ -m32' meson setup \ ${MESON_COMMON_PG_CONFIG_ARGS} \ + -Dextra_include_dirs="${POISONED_HEADERS}" \ --buildtype=debug \ --pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \ - -DPERL=perl5.36-i386-linux-gnu \ + -DPERL=perl5.40-i386-linux-gnu \ ${LINUX_MESON_FEATURES} -Dlibnuma=disabled \ build-32 EOF