v4-0004-ci-Remove-Dextra_XXX-on-FreeBSD-and-macOS.patch

application/x-patch

Filename: v4-0004-ci-Remove-Dextra_XXX-on-FreeBSD-and-macOS.patch

Type: application/x-patch

Part: 3

Message: Re: meson's in-tree libpq header search order vs -Dextra_include_dirs

Patch

Same data as JSON: GET /api/v1/attachments/:id/patch the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes. API reference →

Format: format-patch

Series: patch v4-0004

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

File	+	−
.cirrus.tasks.yml	0	3

From e553e694574113cd0ddf9b07af7ebc8bbaa8e246 Mon Sep 17 00:00:00 2001
From: Thomas Munro <thomas.munro@gmail.com>
Date: Tue, 4 Nov 2025 12:47:41 +1300
Subject: [PATCH v4 4/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.
---
 .cirrus.tasks.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index 3df6de6acd9..31e498dc9b9 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -232,7 +232,6 @@ task:
       meson setup \
         ${MESON_COMMON_PG_CONFIG_ARGS} \
         --buildtype=debug \
-        -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
         ${MESON_COMMON_FEATURES} ${MESON_FEATURES} \
         build
     EOF
@@ -731,8 +730,6 @@ task:
     meson setup \
       ${MESON_COMMON_PG_CONFIG_ARGS} \
       --buildtype=debug \
-      -Dextra_include_dirs=/opt/local/include \
-      -Dextra_lib_dirs=/opt/local/lib \
       ${MESON_COMMON_FEATURES} ${MESON_FEATURES} \
       build
 
-- 
2.51.1