=== Applying patches on top of PostgreSQL commit ID 5e4fcbe531c668b4112beedde97aac79724074c5 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Nov 10 19:15:25 UTC 2025
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 '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".
Unstaged changes after reset:
M	.cirrus.tasks.yml
=== 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 433 (offset 9 lines).
Hunk #2 FAILED at 494.
Hunk #3 succeeded at 527 (offset 8 lines).
Hunk #4 FAILED at 543.
Hunk #5 succeeded at 565 with fuzz 1 (offset 10 lines).
Hunk #6 succeeded at 579 with fuzz 1 (offset 11 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 2fe9671f3dc,3df6de6acd9..00000000000
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@@ -504,7 -511,8 +518,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
@@@ -549,7 -556,8 +569,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
@@@ -559,9 -567,9 +584,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
@@@ -575,9 -582,10 +601,10 @@@
            export CC='ccache gcc -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