=== Applying patches on top of PostgreSQL commit ID 88e947136b47664b6936b35542f2d1eda0c90588 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Apr 19 11:34:22 UTC 2025 On branch cf/5671 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-meson-Add-generated-header-stamps.patch === Applying: meson: Add generated header stamps === using 'git am' to apply patch ./v4-0002-meson-Add-postgresql-extension.pc-for-building-ex.patch === Applying: meson: Add postgresql-extension.pc for building extension libraries === using 'git am' to apply patch ./v4-0003-meson-Test-building-extensions-by-using-postgresq.patch === Applying: meson: Test building extensions by using postgresql-extension.pc === using 'git am' to apply patch ./v4-0004-meson-WIP-Add-docs-for-postgresql-extension.pc.patch === Applying: meson: [WIP] Add docs for postgresql-extension.pc === using 'git am' to apply patch ./v4-0005-meson-Add-architecture-for-LLVM-bitcode-emission.patch === Applying: meson: Add architecture for LLVM bitcode emission === using 'git am' to apply patch ./v4-0006-meson-Add-LLVM-bitcode-emissions-for-contrib-libr.patch === Applying: meson: Add LLVM bitcode emissions for contrib libraries error: sha1 information is lacking or useless (meson.build). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 meson: Add LLVM bitcode emissions for contrib 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". === using patch(1) to apply patch ./v4-0006-meson-Add-LLVM-bitcode-emissions-for-contrib-libr.patch === patching file src/interfaces/libpq/meson.build patching file contrib/bloom/meson.build patching file contrib/bool_plperl/meson.build patching file contrib/btree_gin/meson.build patching file contrib/btree_gist/meson.build Hunk #1 succeeded at 55 (offset 1 line). patching file contrib/citext/meson.build patching file contrib/cube/meson.build patching file contrib/dict_int/meson.build patching file contrib/dict_xsyn/meson.build patching file contrib/earthdistance/meson.build patching file contrib/fuzzystrmatch/meson.build patching file contrib/hstore/meson.build patching file contrib/hstore_plperl/meson.build patching file contrib/hstore_plpython/meson.build patching file contrib/intarray/meson.build patching file contrib/isn/meson.build Hunk #1 succeeded at 30 (offset 1 line). patching file contrib/jsonb_plperl/meson.build patching file contrib/jsonb_plpython/meson.build patching file contrib/lo/meson.build patching file contrib/ltree/meson.build patching file contrib/ltree_plpython/meson.build patching file contrib/pg_buffercache/meson.build Hunk #1 succeeded at 28 (offset 1 line). patching file contrib/pg_freespacemap/meson.build patching file contrib/pg_logicalinspect/meson.build patching file contrib/pg_surgery/meson.build patching file contrib/pg_trgm/meson.build patching file contrib/pgcrypto/meson.build Hunk #1 succeeded at 100 (offset 2 lines). patching file contrib/seg/meson.build patching file contrib/spi/meson.build Hunk #4 FAILED at 122. 1 out of 4 hunks FAILED -- saving rejects to file contrib/spi/meson.build.rej patching file contrib/sslinfo/meson.build patching file contrib/tablefunc/meson.build patching file contrib/tcn/meson.build patching file contrib/tsm_system_rows/meson.build patching file contrib/tsm_system_time/meson.build patching file contrib/unaccent/meson.build patching file contrib/uuid-ossp/meson.build patching file contrib/xml2/meson.build patching file src/pl/plperl/meson.build patching file src/pl/plpython/meson.build patching file meson.build Hunk #1 succeeded at 1272 (offset 28 lines). Unstaged changes after reset: M contrib/bloom/meson.build M contrib/bool_plperl/meson.build M contrib/btree_gin/meson.build M contrib/btree_gist/meson.build M contrib/citext/meson.build M contrib/cube/meson.build M contrib/dict_int/meson.build M contrib/dict_xsyn/meson.build M contrib/earthdistance/meson.build M contrib/fuzzystrmatch/meson.build M contrib/hstore/meson.build M contrib/hstore_plperl/meson.build M contrib/hstore_plpython/meson.build M contrib/intarray/meson.build M contrib/isn/meson.build M contrib/jsonb_plperl/meson.build M contrib/jsonb_plpython/meson.build M contrib/lo/meson.build M contrib/ltree/meson.build M contrib/ltree_plpython/meson.build M contrib/pg_buffercache/meson.build M contrib/pg_freespacemap/meson.build M contrib/pg_logicalinspect/meson.build M contrib/pg_surgery/meson.build M contrib/pg_trgm/meson.build M contrib/pgcrypto/meson.build M contrib/seg/meson.build M contrib/spi/meson.build M contrib/sslinfo/meson.build M contrib/tablefunc/meson.build M contrib/tcn/meson.build M contrib/tsm_system_rows/meson.build M contrib/tsm_system_time/meson.build M contrib/unaccent/meson.build M contrib/uuid-ossp/meson.build M contrib/xml2/meson.build M meson.build M src/interfaces/libpq/meson.build M src/pl/plperl/meson.build M src/pl/plpython/meson.build Removing contrib/spi/meson.build.rej === using 'git apply' to apply patch ./v4-0006-meson-Add-LLVM-bitcode-emissions-for-contrib-libr.patch === Applied patch to 'src/interfaces/libpq/meson.build' cleanly. Applied patch to 'contrib/bloom/meson.build' cleanly. Applied patch to 'contrib/bool_plperl/meson.build' cleanly. Applied patch to 'contrib/btree_gin/meson.build' cleanly. Applied patch to 'contrib/btree_gist/meson.build' cleanly. Applied patch to 'contrib/citext/meson.build' cleanly. Applied patch to 'contrib/cube/meson.build' cleanly. Applied patch to 'contrib/dict_int/meson.build' cleanly. Applied patch to 'contrib/dict_xsyn/meson.build' cleanly. Applied patch to 'contrib/earthdistance/meson.build' cleanly. Applied patch to 'contrib/fuzzystrmatch/meson.build' cleanly. Applied patch to 'contrib/hstore/meson.build' cleanly. Applied patch to 'contrib/hstore_plperl/meson.build' cleanly. Applied patch to 'contrib/hstore_plpython/meson.build' cleanly. Applied patch to 'contrib/intarray/meson.build' cleanly. Applied patch to 'contrib/isn/meson.build' cleanly. Applied patch to 'contrib/jsonb_plperl/meson.build' cleanly. Applied patch to 'contrib/jsonb_plpython/meson.build' cleanly. Applied patch to 'contrib/lo/meson.build' cleanly. Applied patch to 'contrib/ltree/meson.build' cleanly. Applied patch to 'contrib/ltree_plpython/meson.build' cleanly. Applied patch to 'contrib/pg_buffercache/meson.build' cleanly. Applied patch to 'contrib/pg_freespacemap/meson.build' cleanly. Applied patch to 'contrib/pg_logicalinspect/meson.build' cleanly. Applied patch to 'contrib/pg_surgery/meson.build' cleanly. Applied patch to 'contrib/pg_trgm/meson.build' cleanly. Applied patch to 'contrib/pgcrypto/meson.build' cleanly. Applied patch to 'contrib/seg/meson.build' cleanly. Applied patch to 'contrib/spi/meson.build' with conflicts. Applied patch to 'contrib/sslinfo/meson.build' cleanly. Applied patch to 'contrib/tablefunc/meson.build' cleanly. Applied patch to 'contrib/tcn/meson.build' cleanly. Applied patch to 'contrib/tsm_system_rows/meson.build' cleanly. Applied patch to 'contrib/tsm_system_time/meson.build' cleanly. Applied patch to 'contrib/unaccent/meson.build' cleanly. Applied patch to 'contrib/uuid-ossp/meson.build' cleanly. Applied patch to 'contrib/xml2/meson.build' cleanly. Applied patch to 'src/pl/plperl/meson.build' cleanly. Applied patch to 'src/pl/plpython/meson.build' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... U contrib/spi/meson.build diff --cc contrib/spi/meson.build index 3832a91019a,b16c4384bb0..00000000000 --- a/contrib/spi/meson.build +++ b/contrib/spi/meson.build @@@ -108,14 -123,7 +123,20 @@@ install_data('refint.example' kwargs: contrib_doc_args, ) ++<<<<<<< ours +tests += { + 'name': 'spi', + 'sd': meson.current_source_dir(), + 'bd': meson.current_build_dir(), + 'regress': { + 'sql': [ + 'autoinc', + 'refint', + ], + }, ++======= + bitcode_modules += { + 'target': refint, + 'srcfiles': refint_sources, ++>>>>>>> theirs }