On 11.08.22 02:20, Andres Freund wrote:
Attached is a new version of the meson patchset. Plenty changes:
I have various bits of comments on this.
- There are various references to "pch" (pre-compiled headers). Is
there more discussion anywhere about this? I don't know what this
would entail or whether there are any drawbacks to be aware of. The
new *_pch.h files don't have any comments. Maybe this should be a
separate patch later.
- About relativize_shared_library_references: We have had several
patches over the years for working around SIP stuff, and some of
them did essentially this, but we decided not to go ahead with them.
We could revisit that, but it should be a separate patch, not mixed
in with this.
- postgresql-extension.pc: Similarly, this ought to be a separate
patch. If we want people to use this, we'll need it in the makefile
build system anyway.
- -DFRONTEND is used somewhat differently from the makefiles. For
example, meson sets -DFRONTEND for pg_controldata, but the
makefiles don't. Conversely, the makefiles set -DFRONTEND for
ecpglib, but meson does not. This should be checked again to make
sure it all matches up.
- Option name spelling should be make consistent about underscores
versus hyphens. Built-in meson options use underscores, so we
should make the user-defined ones like that as well (some already
do). (wal-blocksize krb-srvnam system-tzdata tap-tests bsd-auth)
- I have found the variable name "cdata" for configuration_data() to
be less than clear. I see some GNOME projects to it that way, is
that where it's from? systemd uses "conf", maybe that's better.
- In the top-level meson.build, the "renaming" of the Windows system
name
host_system = host_machine.system() == 'windows' ? 'win32' :
host_machine.system()
build_system = build_machine.system() == 'windows' ? 'win32' :
build_machine.system()
seems unnecessary to me. Why not stick with the provided names?
- The c99_test ought to be not needed if the c_std project option is
used. Was there a problem with that?
- Is there a way to split up the top-level meson.build somehow? Maybe
just throw some stuff into included files? This might get out of
hand at some point.
- The PG_SYSROOT detection gives different results. On my system,
configure produces
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk,
meson produces
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk.
src/template/darwin goes out of its way to get a version-specific
result, so we need to carry that over somehow. (The difference does
result in differences in the built binaries.)
Then, some patches from me:
0001-Change-shared-library-installation-naming-on-macOS.patch
This changes the makefiles to make the shared library file naming on
macOS match what meson produces. I don't know what the situation is
on other platforms.
0002-meson-Fix-installation-name-of-libpgfeutils.patch
This was presumably an accidental mistake.
0003-meson-Libraries-need-to-be-built-with-DSO_MAJOR_VERS.patch
This is needed to make NLS work for the libraries.
0004-meson-Add-darwin_versions-argument-for-libraries.patch
This is to make the output match what Makefile.shlib produces.
0005-meson-Fix-link-order-of-support-libraries.patch
0006-meson-Make-link-order-of-external-libraries-match-ma.patch
0007-WIP-meson-Make-link-order-of-object-files-match-make.patch
I have analyzed the produced binaries between both build systems to
make sure they match. If we link the files and libraries in different
orders, that becomes difficult. So this fixes this up a bit. 0005 is
needed for correctness in general, I think. 0006 is mostly cosmetic.
You probably wanted to make the library order alphabetical in the
meson files, which I'd support, but then we should change the
makefiles to match. Similarly, 0007, which is clearly a bit messy at
the moment, but we should try to sort that out either in the old or
the new build files.
And finally some comments on your patches:
meson: prereq: Don't add HAVE_LDAP_H HAVE_WINLDAP_H to pg_config.h.
This can go ahead.
meson: prereq: fix warning compat_informix/rnull.pgc with msvc
- $float f = 3.71;
+ $float f = (float) 3.71;
This could use float literals like
+ $float f = 3.71f;
From 054b24e9ae5fc859f13c05d8150ef1168a477ce4 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:18:52 +0200
Subject: [PATCH 1/7] Change shared library installation naming on macOS
It is not customary to install a shared library with a minor version
number (libpq.5.16.dylib) on macOS. We just need the file with the
major version number (libpq.5.dylib) and the one without version
number (libpq.dylib). This also matches the installation layout used
by Meson.
---
src/Makefile.shlib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 2af6192f0f..e4658320f8 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -122,7 +122,7 @@ ifeq ($(PORTNAME), darwin)
version_link = -compatibility_version $(SO_MAJOR_VERSION)
-current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
endif
LINK.shared = $(COMPILER) -dynamiclib -install_name
'$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link)
$(exported_symbols_list) -multiply_defined suppress
- shlib =
lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+ shlib = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
else
# loadable module
--
2.37.1
From 4344679b986d991527c59003d34528377ece8813 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:20:24 +0200
Subject: [PATCH 2/7] meson: Fix installation name of libpgfeutils
---
src/fe_utils/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fe_utils/meson.build b/src/fe_utils/meson.build
index bed3ed78b5..aaf48d2e05 100644
--- a/src/fe_utils/meson.build
+++ b/src/fe_utils/meson.build
@@ -21,7 +21,7 @@ psqlscan = custom_target('psqlscan',
generated_sources += psqlscan
fe_utils_sources += psqlscan
-fe_utils = static_library('pgfeutils',
+fe_utils = static_library('libpgfeutils',
fe_utils_sources + generated_headers,
c_pch: pch_c_h,
include_directories : [postgres_inc, libpq_inc],
--
2.37.1
From e4d1c1dda523ac52cefaff53b8a968b508dbfa9e Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:21:41 +0200
Subject: [PATCH 3/7] meson: Libraries need to be built with
-DSO_MAJOR_VERSION=N
This is used by NLS to locate the right catalog file.
---
src/interfaces/ecpg/compatlib/meson.build | 1 +
src/interfaces/ecpg/ecpglib/meson.build | 1 +
src/interfaces/ecpg/pgtypeslib/meson.build | 1 +
src/interfaces/libpq/meson.build | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/interfaces/ecpg/compatlib/meson.build
b/src/interfaces/ecpg/compatlib/meson.build
index 328f33e5de..2022dec571 100644
--- a/src/interfaces/ecpg/compatlib/meson.build
+++ b/src/interfaces/ecpg/compatlib/meson.build
@@ -3,6 +3,7 @@ export_file = custom_target('libpq.exports', kwargs:
gen_export_kwargs)
ecpg_compat = both_libraries('libecpg_compat',
'informix.c',
include_directories : ['.', ecpg_inc, postgres_inc, libpq_inc],
+ c_args: ['-DSO_MAJOR_VERSION=3'],
dependencies: [frontend_shlib_code, thread_dep],
link_with: [ecpglib, ecpg_pgtypes],
soversion: host_system != 'win32' ? '3' : '',
diff --git a/src/interfaces/ecpg/ecpglib/meson.build
b/src/interfaces/ecpg/ecpglib/meson.build
index 9914aa936d..18300f3ef0 100644
--- a/src/interfaces/ecpg/ecpglib/meson.build
+++ b/src/interfaces/ecpg/ecpglib/meson.build
@@ -16,6 +16,7 @@ export_file = custom_target('libpq.exports', kwargs:
gen_export_kwargs)
ecpglib = both_libraries('libecpg',
ecpglib_sources,
include_directories : ['.', ecpg_inc, postgres_inc],
+ c_args: ['-DSO_MAJOR_VERSION=6'],
dependencies: [frontend_shlib_code, libpq, thread_dep],
link_with: [ecpg_pgtypes],
soversion: host_system != 'win32' ? '6' : '',
diff --git a/src/interfaces/ecpg/pgtypeslib/meson.build
b/src/interfaces/ecpg/pgtypeslib/meson.build
index 28c4e7314b..a33db144e6 100644
--- a/src/interfaces/ecpg/pgtypeslib/meson.build
+++ b/src/interfaces/ecpg/pgtypeslib/meson.build
@@ -12,6 +12,7 @@ export_file = custom_target('libpq.exports', kwargs:
gen_export_kwargs)
ecpg_pgtypes = both_libraries('libpgtypes',
ecpg_pgtypes_sources,
include_directories : ['.', ecpg_inc, postgres_inc],
+ c_args: ['-DSO_MAJOR_VERSION=3'],
dependencies: [frontend_shlib_code],
version: '3.'+pg_version_major.to_string(),
soversion: host_system != 'win32' ? '3' : '',
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build
index bb6a47c5a2..9f29136034 100644
--- a/src/interfaces/libpq/meson.build
+++ b/src/interfaces/libpq/meson.build
@@ -48,7 +48,7 @@ endif
libpq_both = both_libraries('libpq',
libpq_sources,
include_directories : [libpq_inc, postgres_inc],
- c_args: ['-DFRONTEND'],
+ c_args: ['-DFRONTEND', '-DSO_MAJOR_VERSION=5'],
dependencies: libpq_deps,
version: '5.'+pg_version_major.to_string(),
soversion: host_system != 'win32' ? '5' : '' ,
--
2.37.1
From e2e7794707aa017193ba66dc6615c98848b6e06c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:22:24 +0200
Subject: [PATCH 4/7] meson: Add darwin_versions argument for libraries
---
src/interfaces/ecpg/compatlib/meson.build | 1 +
src/interfaces/ecpg/ecpglib/meson.build | 1 +
src/interfaces/ecpg/pgtypeslib/meson.build | 1 +
src/interfaces/libpq/meson.build | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/interfaces/ecpg/compatlib/meson.build
b/src/interfaces/ecpg/compatlib/meson.build
index 2022dec571..b249459e1f 100644
--- a/src/interfaces/ecpg/compatlib/meson.build
+++ b/src/interfaces/ecpg/compatlib/meson.build
@@ -7,6 +7,7 @@ ecpg_compat = both_libraries('libecpg_compat',
dependencies: [frontend_shlib_code, thread_dep],
link_with: [ecpglib, ecpg_pgtypes],
soversion: host_system != 'win32' ? '3' : '',
+ darwin_versions: ['3', '3.'+pg_version_major.to_string()],
version: '3.'+pg_version_major.to_string(),
link_args: export_fmt.format(export_file.full_path()),
link_depends: export_file,
diff --git a/src/interfaces/ecpg/ecpglib/meson.build
b/src/interfaces/ecpg/ecpglib/meson.build
index 18300f3ef0..b9f036a826 100644
--- a/src/interfaces/ecpg/ecpglib/meson.build
+++ b/src/interfaces/ecpg/ecpglib/meson.build
@@ -20,6 +20,7 @@ ecpglib = both_libraries('libecpg',
dependencies: [frontend_shlib_code, libpq, thread_dep],
link_with: [ecpg_pgtypes],
soversion: host_system != 'win32' ? '6' : '',
+ darwin_versions: ['6', '6.'+pg_version_major.to_string()],
version: '6.'+pg_version_major.to_string(),
link_args: export_fmt.format(export_file.full_path()),
link_depends: export_file,
diff --git a/src/interfaces/ecpg/pgtypeslib/meson.build
b/src/interfaces/ecpg/pgtypeslib/meson.build
index a33db144e6..02ae2bcaf9 100644
--- a/src/interfaces/ecpg/pgtypeslib/meson.build
+++ b/src/interfaces/ecpg/pgtypeslib/meson.build
@@ -16,6 +16,7 @@ ecpg_pgtypes = both_libraries('libpgtypes',
dependencies: [frontend_shlib_code],
version: '3.'+pg_version_major.to_string(),
soversion: host_system != 'win32' ? '3' : '',
+ darwin_versions: ['3', '3.'+pg_version_major.to_string()],
link_args: export_fmt.format(export_file.full_path()),
link_depends: export_file,
kwargs: default_lib_args,
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build
index 9f29136034..2cc4f5f8c8 100644
--- a/src/interfaces/libpq/meson.build
+++ b/src/interfaces/libpq/meson.build
@@ -52,6 +52,7 @@ libpq_both = both_libraries('libpq',
dependencies: libpq_deps,
version: '5.'+pg_version_major.to_string(),
soversion: host_system != 'win32' ? '5' : '' ,
+ darwin_versions: ['5', '5.'+pg_version_major.to_string()],
link_depends: export_file,
link_args: export_fmt.format(export_file.full_path()),
kwargs: default_lib_args,
--
2.37.1
From 3f43b456985a59f17053fd33675ab51b66ae6d36 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:27:42 +0200
Subject: [PATCH 5/7] meson: Fix link order of support libraries
---
meson.build | 2 +-
src/common/unicode/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 2e78583c6c..8833a16a3b 100644
--- a/meson.build
+++ b/meson.build
@@ -2505,7 +2505,7 @@ subdir('src/fe_utils')
frontend_code = declare_dependency(
compile_args: ['-DFRONTEND'],
include_directories: [postgres_inc],
- link_with: [pgport_static, common_static, fe_utils],
+ link_with: [fe_utils, common_static, pgport_static],
sources: generated_headers,
dependencies: [os_deps, libintl],
)
diff --git a/src/common/unicode/meson.build b/src/common/unicode/meson.build
index f37f9077d0..44a6cf77c3 100644
--- a/src/common/unicode/meson.build
+++ b/src/common/unicode/meson.build
@@ -73,7 +73,7 @@ norm_test = executable('norm_test',
['norm_test.c', norm_test_table],
dependencies: [frontend_port_code],
include_directories: inc,
- link_with: [pgport_static, common_static],
+ link_with: [common_static, pgport_static],
build_by_default: false,
kwargs: default_bin_args + {
'install': false,
--
2.37.1
From 3fb7b198bc32f372e0288c89a015de4f3587db7c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:29:01 +0200
Subject: [PATCH 6/7] meson: Make link order of external libraries match
makefile order
---
meson.build | 2 +-
src/bin/pg_basebackup/meson.build | 2 +-
src/bin/pg_rewind/meson.build | 2 +-
src/bin/pg_waldump/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 8833a16a3b..938c87d485 100644
--- a/meson.build
+++ b/meson.build
@@ -2492,10 +2492,10 @@ libpq_deps = [
frontend_shlib_code,
thread_dep,
+ ssl,
gssapi,
ldap,
libintl,
- ssl,
]
subdir('src/interfaces/libpq')
diff --git a/src/bin/pg_basebackup/meson.build
b/src/bin/pg_basebackup/meson.build
index 857e2b77d2..dcaae84b9a 100644
--- a/src/bin/pg_basebackup/meson.build
+++ b/src/bin/pg_basebackup/meson.build
@@ -10,7 +10,7 @@ common_sources = files(
'walmethods.c',
)
-pg_basebackup_deps = [frontend_code, libpq, lz4, zlib, zstd]
+pg_basebackup_deps = [frontend_code, libpq, zstd, lz4, zlib]
pg_basebackup_common = static_library('libpg_basebackup_common',
common_sources,
dependencies: pg_basebackup_deps,
diff --git a/src/bin/pg_rewind/meson.build b/src/bin/pg_rewind/meson.build
index 40ae593e7c..bef4bafb4f 100644
--- a/src/bin/pg_rewind/meson.build
+++ b/src/bin/pg_rewind/meson.build
@@ -12,7 +12,7 @@ pg_rewind_sources = files(
pg_rewind = executable('pg_rewind',
pg_rewind_sources,
- dependencies: [frontend_code, libpq, lz4, zstd],
+ dependencies: [frontend_code, libpq, zstd, lz4],
kwargs: default_bin_args,
)
diff --git a/src/bin/pg_waldump/meson.build b/src/bin/pg_waldump/meson.build
index e482006264..afa1a269c3 100644
--- a/src/bin/pg_waldump/meson.build
+++ b/src/bin/pg_waldump/meson.build
@@ -10,7 +10,7 @@ pg_waldump_sources +=
files('../../backend/access/transam/xlogstats.c')
pg_waldump = executable('pg_waldump',
pg_waldump_sources,
- dependencies: [frontend_code, lz4, zstd],
+ dependencies: [frontend_code, zstd, lz4],
kwargs: default_bin_args,
)
--
2.37.1
From 2e35b207d2accd69baa2557dd908066cb436bebf Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Wed, 17 Aug 2022 14:31:09 +0200
Subject: [PATCH 7/7] WIP: meson: Make link order of object files match
makefile order
---
src/bin/pg_basebackup/meson.build | 2 +-
src/bin/pg_waldump/Makefile | 2 +-
src/common/Makefile | 17 ++++++++++-------
src/fe_utils/Makefile | 2 +-
src/interfaces/libpq/meson.build | 4 ++--
src/port/Makefile | 6 +++---
6 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/bin/pg_basebackup/meson.build
b/src/bin/pg_basebackup/meson.build
index dcaae84b9a..dd388d8a1e 100644
--- a/src/bin/pg_basebackup/meson.build
+++ b/src/bin/pg_basebackup/meson.build
@@ -3,8 +3,8 @@ common_sources = files(
'bbstreamer_gzip.c',
'bbstreamer_inject.c',
'bbstreamer_lz4.c',
- 'bbstreamer_tar.c',
'bbstreamer_zstd.c',
+ 'bbstreamer_tar.c',
'receivelog.c',
'streamutil.c',
'walmethods.c',
diff --git a/src/bin/pg_waldump/Makefile b/src/bin/pg_waldump/Makefile
index d6459e17c7..53c602c3ca 100644
--- a/src/bin/pg_waldump/Makefile
+++ b/src/bin/pg_waldump/Makefile
@@ -8,11 +8,11 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = \
- $(RMGRDESCOBJS) \
$(WIN32RES) \
compat.o \
pg_waldump.o \
rmgrdesc.o \
+ $(RMGRDESCOBJS) \
xlogreader.o \
xlogstats.o
diff --git a/src/common/Makefile b/src/common/Makefile
index e9af7346c9..05ea957861 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -50,12 +50,9 @@ OBJS_COMMON = \
base64.o \
checksum_helper.o \
compression.o \
- config_info.o \
controldata_utils.o \
- d2s.o \
encnames.o \
exec.o \
- f2s.o \
file_perm.o \
file_utils.o \
hashfn.o \
@@ -83,9 +80,9 @@ OBJS_COMMON = \
ifeq ($(with_ssl),openssl)
OBJS_COMMON += \
- protocol_openssl.o \
cryptohash_openssl.o \
- hmac_openssl.o
+ hmac_openssl.o \
+ protocol_openssl.o
else
OBJS_COMMON += \
cryptohash.o \
@@ -95,6 +92,11 @@ OBJS_COMMON += \
sha2.o
endif
+OBJS_EXTRA = \
+ d2s.o \
+ f2s.o \
+ config_info.o
+
# A few files are currently only built for frontend, not server
# (Mkvcbuild.pm has a copy of this list, too). logging.c is excluded
# from OBJS_FRONTEND_SHLIB (shared library) as a matter of policy,
@@ -104,14 +106,15 @@ OBJS_FRONTEND_SHLIB = \
$(OBJS_COMMON) \
fe_memutils.o \
restricted_token.o \
- sprompt.o
+ sprompt.o \
+ $(OBJS_EXTRA)
OBJS_FRONTEND = \
$(OBJS_FRONTEND_SHLIB) \
logging.o
# foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
OBJS_SHLIB = $(OBJS_FRONTEND_SHLIB:%.o=%_shlib.o)
-OBJS_SRV = $(OBJS_COMMON:%.o=%_srv.o)
+OBJS_SRV = $(OBJS_COMMON:%.o=%_srv.o) $(OBJS_EXTRA:%.o=%_srv.o)
# where to find gen_keywordlist.pl and subsidiary files
TOOLSDIR = $(top_srcdir)/src/tools
diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile
index 44bc7a1215..ab750d336a 100644
--- a/src/fe_utils/Makefile
+++ b/src/fe_utils/Makefile
@@ -20,6 +20,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = \
+ psqlscan.o \
archive.o \
cancel.o \
conditional.o \
@@ -28,7 +29,6 @@ OBJS = \
option_utils.o \
parallel_slot.o \
print.o \
- psqlscan.o \
query_utils.o \
recovery_gen.o \
simple_list.o \
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build
index 2cc4f5f8c8..0a78a498c7 100644
--- a/src/interfaces/libpq/meson.build
+++ b/src/interfaces/libpq/meson.build
@@ -28,8 +28,8 @@ endif
if gssapi.found()
libpq_sources += files(
- 'fe-secure-gssapi.c',
- 'fe-gssapi-common.c'
+ 'fe-gssapi-common.c',
+ 'fe-secure-gssapi.c'
)
endif
diff --git a/src/port/Makefile b/src/port/Makefile
index b3754d8940..d8da9d77b6 100644
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -38,8 +38,6 @@ LIBS += $(PTHREAD_LIBS)
# If you add objects here, see also src/tools/msvc/Mkvcbuild.pm
OBJS = \
- $(LIBOBJS) \
- $(PG_CRC32C_OBJS) \
bsearch_arg.o \
chklocale.o \
inet_net_ntop.o \
@@ -59,7 +57,9 @@ OBJS = \
snprintf.o \
strerror.o \
tar.o \
- thread.o
+ thread.o \
+ $(LIBOBJS) \
+ $(PG_CRC32C_OBJS)
# libpgport.a, libpgport_shlib.a, and libpgport_srv.a contain the same files
# foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
--
2.37.1
