=== Applying patches on top of PostgreSQL commit ID 462fe0ff6215ae222fc866af621e4b86462289b1 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Feb 24 07:05:22 UTC 2026 On branch cf/6450 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-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 .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 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/ecpg/pgtypeslib/meson.build Auto-merging src/interfaces/ecpg/ecpglib/meson.build Auto-merging src/interfaces/ecpg/compatlib/meson.build Auto-merging meson.build CONFLICT (content): Merge conflict in 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 meson.build M src/interfaces/ecpg/pgtypeslib/meson.build M src/interfaces/libpq/meson.build === using patch(1) to apply patch ./v3-0001-meson-allow-disabling-building-installation-of-st.patch === patching file .cirrus.tasks.yml Hunk #1 FAILED at 133. 1 out of 1 hunk FAILED -- saving rejects to file .cirrus.tasks.yml.rej patching file meson.build Hunk #1 FAILED at 20. Hunk #2 succeeded at 29 with fuzz 2 (offset -21 lines). Hunk #3 FAILED at 3129. Hunk #4 FAILED at 3555. Hunk #5 FAILED at 3905. 4 out of 5 hunks FAILED -- saving rejects to file meson.build.rej patching file src/common/meson.build Hunk #1 FAILED at 192. 1 out of 1 hunk FAILED -- saving rejects to file src/common/meson.build.rej patching file src/fe_utils/meson.build Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file src/fe_utils/meson.build.rej patching file src/interfaces/ecpg/compatlib/meson.build Hunk #1 FAILED at 16. Hunk #2 FAILED at 25. Hunk #3 FAILED at 40. 3 out of 3 hunks FAILED -- saving rejects to file src/interfaces/ecpg/compatlib/meson.build.rej patching file src/interfaces/ecpg/ecpglib/meson.build Hunk #1 FAILED at 25. Hunk #2 FAILED at 35. Hunk #3 FAILED at 51. 3 out of 3 hunks FAILED -- saving rejects to file src/interfaces/ecpg/ecpglib/meson.build.rej patching file src/interfaces/ecpg/pgtypeslib/meson.build Hunk #1 FAILED at 21. Hunk #2 FAILED at 45. 2 out of 2 hunks FAILED -- saving rejects to file src/interfaces/ecpg/pgtypeslib/meson.build.rej patching file src/interfaces/libpq-oauth/meson.build Hunk #1 FAILED at 21. Hunk #2 FAILED at 32. Hunk #3 succeeded at 74 with fuzz 2 (offset 27 lines). 2 out of 3 hunks FAILED -- saving rejects to file src/interfaces/libpq-oauth/meson.build.rej patching file src/interfaces/libpq/meson.build Hunk #1 FAILED at 57. Hunk #2 FAILED at 65. Hunk #3 succeeded at 91 with fuzz 2 (offset 12 lines). 2 out of 3 hunks FAILED -- saving rejects to file src/interfaces/libpq/meson.build.rej patching file src/port/meson.build Hunk #1 FAILED at 192. 1 out of 1 hunk FAILED -- saving rejects to file src/port/meson.build.rej Unstaged changes after reset: M meson.build M src/interfaces/libpq-oauth/meson.build M src/interfaces/libpq/meson.build Removing .cirrus.tasks.yml.rej Removing meson.build.rej Removing src/common/meson.build.rej Removing src/fe_utils/meson.build.rej Removing src/interfaces/ecpg/compatlib/meson.build.rej Removing src/interfaces/ecpg/ecpglib/meson.build.rej Removing src/interfaces/ecpg/pgtypeslib/meson.build.rej Removing src/interfaces/libpq-oauth/meson.build.rej Removing src/interfaces/libpq/meson.build.rej Removing src/port/meson.build.rej === using 'git apply' to apply patch ./v3-0001-meson-allow-disabling-building-installation-of-st.patch === Applied patch to '.cirrus.tasks.yml' cleanly. Applied patch to 'meson.build' with conflicts. 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' cleanly. Applied patch to 'src/interfaces/libpq/meson.build' with conflicts. Applied patch to 'src/port/meson.build' cleanly. U meson.build U src/interfaces/libpq/meson.build diff --cc meson.build index 5122706477d,9ce34e3ce37..00000000000 --- a/meson.build +++ b/meson.build @@@ -74,7 -74,6 +74,10 @@@ if default_library_opt == 'shared install_internal_static_lib = false elif default_library_opt == 'static' build_shared_lib = false ++<<<<<<< ours + error('-Ddefault_library=static is not yet supported') ++======= ++>>>>>>> theirs endif diff --cc src/interfaces/libpq/meson.build index b0ae72167a1,2b95098187e..00000000000 --- a/src/interfaces/libpq/meson.build +++ b/src/interfaces/libpq/meson.build @@@ -55,9 -55,8 +55,14 @@@ libpq_so_c_args = ['-DUSE_DYNAMIC_OAUTH # libpq_st, and {pgport,common}_shlib for libpq_sh # # We could try to avoid building the source files twice, but it probably adds ++<<<<<<< ours +# more complexity than its worth (AIX doesn't support link_whole yet, reusing +# object files requires also linking to the library on windows or breaks +# precompiled headers). ++======= + # more complexity than its worth (reusing object files requires also linking + # to the library on windows or breaks precompiled headers). ++>>>>>>> theirs if build_static_lib libpq_st = static_library('libpq', libpq_sources,