Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: postgresql-cfbot/postgresql
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cf/6056~1
Choose a base ref
...
head repository: postgresql-cfbot/postgresql
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf/6056
Choose a head ref
  • 5 commits
  • 34 files changed
  • 2 contributors

Commits on Nov 4, 2025

  1. meson: Fix libpq header include order. 

    Don't allow external copies of libpq-fe.h to hide the in-tree libpq's
headers.  libpq is now always declared as the first dependency, so that
it can arrange for libpq_inc to be searched before extra_include_dirs,
c_flags or system/ports include directory discovered by Meson.

This is mostly a mechanical change to multiple dependency lists.  A
separate commit will add a CI check to prevent future mistakes.

This clearly didn't affect many people, maybe just me (Thomas), but it
could have broken on basically any non-Linux system that happened to
install a libpq-with-headers package.

Back-patch to 16, where meson arrived.

Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Reviewed-by: Bilal Yavuz <byavuz81@gmail.com>
Reviewed-by: Tristan Partin <tristan@partin.io>
Discussion: https://postgr.es/m/CA+hUKGKispvxLyrBn3=3mp0BB1N+RBYR5eE2guCOksnwEoOcPQ@mail.gmail.com
    @macdice
    macdice authored and Commitfest Bot committed Nov 4, 2025
    Configuration menu
    Copy the full SHA
    a52aac4 View commit details
    Browse the repository at this point in the history

  2. ci: Test include path order with canary libpq-fe.h. 

    If the build script would allow libpq-fe.h installed under
--with-includes (configure) or -Dextra_include_dirs (meson) to hide the
in-tree header, it will now reach an #error in contrived error on CI.
This tests that libpq is ordered correctly for all code that includes
the header.  The list of canary headers could be extended in future.

Also add missing set -e to the shell scripts run under su, since
otherwise the build step would confusingly succeed despite not
completing.

Reviewed-by: Bilal Yavuz <byavuz81@gmail.com>
Discussion: https://postgr.es/m/CA%2BhUKG%2Bx-cys30%3D7L2B8%3DcZ%2B-z6QDOj-oQy9O3CnkeXnrnm3OQ%40mail.gmail.com
    @macdice
    macdice authored and Commitfest Bot committed Nov 4, 2025
    Configuration menu
    Copy the full SHA
    45b7001 View commit details
    Browse the repository at this point in the history

  3. meson: Try to find libintl without -Dextra_XXX. 

    Since libintl is the only dependency that Meson can't usually find via
pkg-config on typical non-Linux Unix systems, let's try a bit harder to
find it with existing clues.

We typically find msgfmt in $PATH, so we can plausibly guess that the
library and headers are installed in the same prefix, and then try that
before giving up and requiring a manual path configuration.

This revealed some missing dependency declarations previously covered by
the catch-all extra_includes_dir, added here.

XXX Is this a terrible idea for some reason?
    @macdice
    macdice authored and Commitfest Bot committed Nov 4, 2025
    Configuration menu
    Copy the full SHA
    2b8dcb8 View commit details
    Browse the repository at this point in the history

  4. ci: Remove -Dextra_XXX on FreeBSD and macOS. 

    Since FreeBSD and MacPorts install .pc files for the libraries want,
Meson can find them.  The only exception is libintl, which the previous
commit handled specially.

NetBSD has its own libintl in libc, and OpenBSD doesn't have nls
enabled, explaining why they didn't need -Dextra_include_dirs and
-Dextra_lib_dirs in the first place.  The Windows task still needs them
to find OpenSSL.
    @macdice
    macdice authored and Commitfest Bot committed Nov 4, 2025
    Configuration menu
    Copy the full SHA
    2a21b51 View commit details
    Browse the repository at this point in the history

  5. [CF 6056] v4 - meson: Fix libpq search order 

    This branch was automatically generated by a robot using patches from an
email thread registered at:

https://commitfest.postgresql.org/patch/6056

The branch will be overwritten each time a new patch version is posted to
the thread, and also periodically to check for bitrot caused by changes
on the master branch.

Patch(es): https://www.postgresql.org/message-id/CA+hUKGJk85+sDf4D=JSwuvA9a4-sy6fnM3B=CVaU9Rk2V4NE2g@mail.gmail.com
Author(s): Thomas Munro
    Commitfest Bot committed Nov 4, 2025
    Configuration menu
    Copy the full SHA
    ecfa944 View commit details
    Browse the repository at this point in the history
Loading