public inbox for [email protected]  
help / color / mirror / Atom feed
From: Peter Eisentraut <[email protected]>
To: [email protected] <[email protected]>
Cc: Robert Haas <[email protected]>
Cc: Ryohei Takahashi (Fujitsu) <[email protected]>
Cc: Dave Page <[email protected]>
Cc: Gurjeet Singh <[email protected]>
Subject: Re: doc: pgevent.dll location
Date: Wed, 13 Nov 2024 09:53:36 +0100
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
References: <TY3PR01MB118912125614599641CA881B782522@TY3PR01MB11891.jpnprd01.prod.outlook.com>
	<CABwTF4WczBfnRcqPpF+bfGbBXnv69TtauScokDSRYUvEHSSKDw@mail.gmail.com>
	<CA+Tgmoa_kC1T5PR0C7K0cGo1OEPx2c4zQ13ziwqm=pz7K_367g@mail.gmail.com>
	<CA+OCxoywke+6M7yO7-eUD4RwJiuGk-ydCJqh3bkbG3PjoLAhWg@mail.gmail.com>
	<TY3PR01MB118914759E215A415D418B42B82532@TY3PR01MB11891.jpnprd01.prod.outlook.com>
	<[email protected]>
	<CA+TgmoZ+yTDsL7-u62O1F=YXag8WXqBNDdxy22kfJq_avyKEtg@mail.gmail.com>
	<[email protected]>

On 12.11.24 17:52, Peter Eisentraut wrote:
> So the most straightforward way to "make it work like it used to" would 
> be to change src/bin/pgevent/meson.build to use shared_module() instead 
> of shared_library().

I developed the attached patch for this.

I haven't tested it locally, but I checked in the CI logs that the build 
commands for pgevent don't change with this.  CI doesn't test meson 
install, it seems, so can't actually tell whether this changes the 
installation directory successfully, but I think it should work. 
Someone with Windows handy please give this a test.

From 064013af8020112b5ee96538e9bf928c623b74e0 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Wed, 13 Nov 2024 09:49:25 +0100
Subject: [PATCH] meson: Build pgevent as shared_module rather than
 shared_library

This matches the behavior of the makefiles and the old MSVC build
system.  The main effect is that the build result gets installed into
pkglibdir rather than bindir.  The documentation says to locate the
library in pkglibdir, so this makes the code match the documentation
again.

Reported-by: Ryohei Takahashi (Fujitsu) <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/TY3PR01MB118912125614599641CA881B782522%40TY3PR01MB11891....

ci-os-only: windows
---
 src/bin/pgevent/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bin/pgevent/meson.build b/src/bin/pgevent/meson.build
index 5c2d296fef9..f7422438664 100644
--- a/src/bin/pgevent/meson.build
+++ b/src/bin/pgevent/meson.build
@@ -21,13 +21,11 @@ if cc.get_id() == 'msvc'
   pgevent_link_args += '/ignore:4104'
 endif
 
-pgevent = shared_library('pgevent',
+pgevent = shared_module('pgevent',
   pgevent_sources,
   dependencies: [frontend_code],
   link_args: pgevent_link_args,
   vs_module_defs: 'pgevent.def',
-  kwargs: default_lib_args + {
-    'name_prefix': '',
-  },
+  kwargs: default_mod_args,
 )
 bin_targets += pgevent
-- 
2.47.0



Attachments:

  [text/plain] 0001-meson-Build-pgevent-as-shared_module-rather-than-sha.patch (1.4K, ../[email protected]/2-0001-meson-Build-pgevent-as-shared_module-rather-than-sha.patch)
  download | inline diff:
From 064013af8020112b5ee96538e9bf928c623b74e0 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Wed, 13 Nov 2024 09:49:25 +0100
Subject: [PATCH] meson: Build pgevent as shared_module rather than
 shared_library

This matches the behavior of the makefiles and the old MSVC build
system.  The main effect is that the build result gets installed into
pkglibdir rather than bindir.  The documentation says to locate the
library in pkglibdir, so this makes the code match the documentation
again.

Reported-by: Ryohei Takahashi (Fujitsu) <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/TY3PR01MB118912125614599641CA881B782522%40TY3PR01MB11891.jpnprd01.prod.outlook.com

ci-os-only: windows
---
 src/bin/pgevent/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bin/pgevent/meson.build b/src/bin/pgevent/meson.build
index 5c2d296fef9..f7422438664 100644
--- a/src/bin/pgevent/meson.build
+++ b/src/bin/pgevent/meson.build
@@ -21,13 +21,11 @@ if cc.get_id() == 'msvc'
   pgevent_link_args += '/ignore:4104'
 endif
 
-pgevent = shared_library('pgevent',
+pgevent = shared_module('pgevent',
   pgevent_sources,
   dependencies: [frontend_code],
   link_args: pgevent_link_args,
   vs_module_defs: 'pgevent.def',
-  kwargs: default_lib_args + {
-    'name_prefix': '',
-  },
+  kwargs: default_mod_args,
 )
 bin_targets += pgevent
-- 
2.47.0



view thread (17+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
  Subject: Re: doc: pgevent.dll location
  In-Reply-To: <[email protected]>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox