=== Applying patches on top of PostgreSQL commit ID b9278871f991e0c1419b96b7508fe5206903fb1a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Feb 23 15:37:30 UTC 2026 On branch cf/6511 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-meson-allow-disabling-building-installation-of-st.patch === Applying: meson: allow disabling building/installation of static libraries. Using index info to reconstruct a base tree... M meson.build M src/interfaces/libpq-oauth/meson.build M src/interfaces/libpq/meson.build M src/port/meson.build Falling back to patching base and 3-way merge... Auto-merging src/port/meson.build Auto-merging src/interfaces/libpq/meson.build CONFLICT (content): Merge conflict in src/interfaces/libpq/meson.build Auto-merging src/interfaces/libpq-oauth/meson.build CONFLICT (content): Merge conflict in src/interfaces/libpq-oauth/meson.build Auto-merging meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 meson: allow disabling building/installation of static libraries. 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 M meson.build M src/common/meson.build M src/fe_utils/meson.build M src/interfaces/ecpg/compatlib/meson.build M src/interfaces/ecpg/ecpglib/meson.build M src/interfaces/ecpg/pgtypeslib/meson.build M src/interfaces/libpq-oauth/meson.build M src/interfaces/libpq/meson.build M src/port/meson.build === using patch(1) to apply patch ./v7-0001-meson-allow-disabling-building-installation-of-st.patch === patching file .cirrus.tasks.yml patching file meson.build Hunk #3 FAILED at 3130. Hunk #4 FAILED at 3556. Hunk #5 FAILED at 3906. 3 out of 5 hunks FAILED -- saving rejects to file meson.build.rej patching file src/common/meson.build patching file src/fe_utils/meson.build patching file src/interfaces/ecpg/compatlib/meson.build patching file src/interfaces/ecpg/ecpglib/meson.build patching file src/interfaces/ecpg/pgtypeslib/meson.build patching file src/interfaces/libpq-oauth/meson.build Hunk #2 FAILED at 33. Hunk #3 succeeded at 71 with fuzz 2 (offset 23 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/interfaces/libpq-oauth/meson.build.rej patching file src/interfaces/libpq/meson.build Hunk #2 FAILED at 66. Hunk #3 succeeded at 87 with fuzz 2 (offset 7 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/interfaces/libpq/meson.build.rej patching file src/port/meson.build Hunk #1 succeeded at 191 (offset -1 lines). Unstaged changes after reset: M .cirrus.tasks.yml M meson.build M src/common/meson.build M src/fe_utils/meson.build M src/interfaces/ecpg/compatlib/meson.build M src/interfaces/ecpg/ecpglib/meson.build M src/interfaces/ecpg/pgtypeslib/meson.build M src/interfaces/libpq-oauth/meson.build M src/interfaces/libpq/meson.build M src/port/meson.build Removing meson.build.rej Removing src/interfaces/libpq-oauth/meson.build.rej Removing src/interfaces/libpq/meson.build.rej === using 'git apply' to apply patch ./v7-0001-meson-allow-disabling-building-installation-of-st.patch === Applied patch to '.cirrus.tasks.yml' cleanly. Applied patch to 'meson.build' cleanly. Applied patch to 'src/common/meson.build' cleanly. Applied patch to 'src/fe_utils/meson.build' cleanly. Applied patch to 'src/interfaces/ecpg/compatlib/meson.build' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/meson.build' cleanly. Applied patch to 'src/interfaces/ecpg/pgtypeslib/meson.build' cleanly. Applied patch to 'src/interfaces/libpq-oauth/meson.build' with conflicts. Applied patch to 'src/interfaces/libpq/meson.build' with conflicts. Applied patch to 'src/port/meson.build' cleanly. U src/interfaces/libpq-oauth/meson.build U src/interfaces/libpq/meson.build diff --cc src/interfaces/libpq-oauth/meson.build index e573d36f20e,27aca2bc324..00000000000 --- a/src/interfaces/libpq-oauth/meson.build +++ b/src/interfaces/libpq-oauth/meson.build @@@ -33,6 -34,7 +34,10 @@@ libpq_oauth_st = static_library('libpq- kwargs: default_lib_args, ) libpq_targets += libpq_oauth_st ++<<<<<<< ours ++======= + endif ++>>>>>>> theirs # This is an internal module; we don't want an SONAME and therefore do not set # SO_MAJOR_VERSION. @@@ -49,6 -52,7 +55,10 @@@ libpq_oauth_so = shared_module(libpq_oa kwargs: default_lib_args, ) libpq_targets += libpq_oauth_so ++<<<<<<< ours ++======= + endif ++>>>>>>> theirs libpq_oauth_test_deps = [] diff --cc src/interfaces/libpq/meson.build index 0b8dd3e1f5e,2b95098187e..00000000000 --- a/src/interfaces/libpq/meson.build +++ b/src/interfaces/libpq/meson.build @@@ -66,7 -67,9 +67,12 @@@ libpq_st = static_library('libpq' kwargs: default_lib_args, ) libpq_targets += libpq_st ++<<<<<<< ours ++======= + endif ++>>>>>>> theirs + if build_shared_lib libpq_so = shared_library('libpq', libpq_sources + libpq_so_sources, include_directories: [libpq_inc, postgres_inc], @@@ -81,6 -84,7 +87,10 @@@ kwargs: default_lib_args, ) libpq_targets += libpq_so ++<<<<<<< ours ++======= + endif ++>>>>>>> theirs libpq = declare_dependency( link_with: [libpq_so],