0002-Fix-Mkvcbuild.pm-builds-of-test_cloexec.c.patch

application/octet-stream

Filename: 0002-Fix-Mkvcbuild.pm-builds-of-test_cloexec.c.patch
Type: application/octet-stream
Part: 1
Message: Re: [PATCH] O_CLOEXEC not honored on Windows - handle inheritance chain
From 0904001e7d4843998b4430f235c4389657375f44 Mon Sep 17 00:00:00 2001
From: Thomas Munro <thomas.munro@gmail.com>
Date: Mon, 22 Dec 2025 12:13:51 +1300
Subject: [PATCH 2/2] Fix Mkvcbuild.pm builds of test_cloexec.c.

Mkvcbuild.pm was not happy with the Makefile change in commit bec2a0aa,
as revealed by build farm animal fairywren on branch REL_16_STABLE:

1.  It used += instead of = in test_cloexec/Makefile.  It's valid make
syntax, but the Mkvcbuild.pm's scraping regexes didn't like that
pattern.  Drop the unnecessary + signs.

2.  Mkvcbuild.pm builds didn't automatically add libpgport.  Although
this program doesn't use libpq, setting PG_LIBS_INTERNAL to
$(libpq_pgport) is a simple way to trigger Mkvcbuild.pm to add it.

"vcregress.pl modulescheck" still doesn't actually run the new test (or
other similar tests), because it only supports pg_regress tests.

Backpatch-through: 16
Reported-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/175163.1766357334%40sss.pgh.pa.us
---
 src/test/modules/test_cloexec/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/modules/test_cloexec/Makefile b/src/test/modules/test_cloexec/Makefile
index cd16a59add5..4f0ed58714e 100644
--- a/src/test/modules/test_cloexec/Makefile
+++ b/src/test/modules/test_cloexec/Makefile
@@ -3,8 +3,9 @@
 PGFILEDESC = "test_cloexec - test O_CLOEXEC flag handling"
 PGAPPICON = win32
 
-PROGRAM += test_cloexec
-OBJS += $(WIN32RES) test_cloexec.o
+PROGRAM = test_cloexec
+OBJS = $(WIN32RES) test_cloexec.o
+PG_LIBS_INTERNAL = $(libpq_pgport)
 
 NO_INSTALLCHECK = 1
 TAP_TESTS = 1
-- 
2.50.1 (Apple Git-155)