=== Applying patches on top of PostgreSQL commit ID f54af9f2679d5987b4680e742ac9bd585260e620 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jul  8 04:56:19 UTC 2025
On branch cf/5885
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Decouple-C-support-in-Meson-s-PGXS-from-LLVM-enablem.patch ===
Applying: Decouple C++ support in Meson's PGXS from LLVM enablement
Using index info to reconstruct a base tree...
M	meson.build
M	src/makefiles/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/makefiles/meson.build
CONFLICT (content): Merge conflict in src/makefiles/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 Decouple C++ support in Meson's PGXS from LLVM enablement
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/include/meson.build
M	src/makefiles/meson.build
=== using patch(1) to apply patch ./0001-Decouple-C-support-in-Meson-s-PGXS-from-LLVM-enablem.patch ===
patching file meson.build
Hunk #1 succeeded at 41 (offset 1 line).
Hunk #2 succeeded at 808 (offset 6 lines).
Hunk #3 succeeded at 823 (offset 6 lines).
Hunk #4 succeeded at 2088 (offset 28 lines).
Hunk #5 succeeded at 2112 (offset 28 lines).
Hunk #6 succeeded at 2166 (offset 28 lines).
Hunk #7 succeeded at 2227 (offset 28 lines).
Hunk #8 FAILED at 3927.
1 out of 8 hunks FAILED -- saving rejects to file meson.build.rej
patching file src/include/meson.build
patching file src/makefiles/meson.build
Hunk #2 FAILED at 120.
1 out of 2 hunks FAILED -- saving rejects to file src/makefiles/meson.build.rej
Unstaged changes after reset:
M	meson.build
M	src/include/meson.build
M	src/makefiles/meson.build
Removing meson.build.rej
Removing src/makefiles/meson.build.rej
=== using 'git apply' to apply patch ./0001-Decouple-C-support-in-Meson-s-PGXS-from-LLVM-enablem.patch ===
Applied patch to 'meson.build' with conflicts.
Applied patch to 'src/include/meson.build' cleanly.
Applied patch to 'src/makefiles/meson.build' with conflicts.
U meson.build
U src/makefiles/meson.build
diff --cc meson.build
index 5365aaf95e6,f63769f8b67..00000000000
--- a/meson.build
+++ b/meson.build
@@@ -3955,46 -3926,65 +3962,108 @@@ if llvm.found(
      },
      section: 'Compiler Flags',
    )
 +endif
  
++<<<<<<< ours
 +summary(
 +  {
 +    'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
 +    'dtrace': dtrace,
 +    'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
 +  },
 +  section: 'Programs',
 +)
++=======
+   if have_cpp
+     summary(
+       {
+         'C++ compiler': '@0@ @1@'.format(cpp.get_id(), cpp.version()),
+       },
+       section: 'Compiler',
+     )
+ 
+     summary(
+       {
+         'C++ FLAGS, functional': ' '.join(cxxflags),
+         'C++ FLAGS, warnings': ' '.join(cxxflags_warn),
+         'C++ FLAGS, user specified': ' '.join(get_option('cpp_args')),
+       },
+       section: 'Compiler Flags',
+     )
+   endif
+ 
+   summary(
+     {
+       'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
+       'dtrace': dtrace,
+       'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
+     },
+     section: 'Programs',
+   )
+ 
+   summary(
+     {
+       'bonjour': bonjour,
+       'bsd_auth': bsd_auth,
+       'docs': docs_dep,
+       'docs_pdf': docs_pdf_dep,
+       'gss': gssapi,
+       'icu': icu,
+       'ldap': ldap,
+       'libcurl': libcurl,
+       'libnuma': libnuma,
+       'liburing': liburing,
+       'libxml': libxml,
+       'libxslt': libxslt,
+       'llvm': llvm,
+       'lz4': lz4,
+       'nls': libintl,
+       'openssl': ssl,
+       'pam': pam,
+       'plperl': [perl_dep, perlversion],
+       'plpython': python3_dep,
+       'pltcl': tcl_dep,
+       'readline': readline,
+       'selinux': selinux,
+       'systemd': systemd,
+       'uuid': uuid,
+       'zlib': zlib,
+       'zstd': zstd,
+     },
+     section: 'External libraries',
+     list_sep: ' ',
+   )
++>>>>>>> theirs
  
 -endif
 +summary(
 +  {
 +    'bonjour': bonjour,
 +    'bsd_auth': bsd_auth,
 +    'docs': docs_dep,
 +    'docs_pdf': docs_pdf_dep,
 +    'gss': gssapi,
 +    'icu': icu,
 +    'ldap': ldap,
 +    'libcurl': libcurl,
 +    'libnuma': libnuma,
 +    'liburing': liburing,
 +    'libxml': libxml,
 +    'libxslt': libxslt,
 +    'llvm': llvm,
 +    'lz4': lz4,
 +    'nls': libintl,
 +    'openssl': ssl,
 +    'pam': pam,
 +    'plperl': [perl_dep, perlversion],
 +    'plpython': python3_dep,
 +    'pltcl': tcl_dep,
 +    'readline': readline,
 +    'selinux': selinux,
 +    'systemd': systemd,
 +    'uuid': uuid,
 +    'zlib': zlib,
 +    'zstd': zstd,
 +  },
 +  section: 'External libraries',
 +  list_sep: ' ',
 +)
diff --cc src/makefiles/meson.build
index 54dbc059ada,bee83a66e81..00000000000
--- a/src/makefiles/meson.build
+++ b/src/makefiles/meson.build
@@@ -121,10 -120,15 +120,20 @@@ pgxs_kv = 
    'LIBS': var_libs,
  }
  
+ if have_cpp
+   pgxs_kv += {
+     'CXX': ' '.join(cpp.cmd_array()),
+   }
+ endif
+ 
  if llvm.found()
    pgxs_kv += {
++<<<<<<< ours
 +    'CLANG': clang.full_path(),
 +    'CXX': ' '.join(cpp.cmd_array()),
++=======
+     'CLANG': clang.path(),
++>>>>>>> theirs
      'LLVM_BINPATH': llvm_binpath,
    }
  else