pg.ddx.io pgsql-hackers@postgresql.org mailing list archive
help / color / mirror / Atom feed[RFC] building postgres with meson
143+ messages / 14 participants
[nested] [flat]
Commits from this thread:
2022-09-22 e6927270cd meson: Add initial version of meson based build system
2022-02-10 ea09a75e1e 92f60f536e eec7c640fe 64dd648072 e2d104e190 a5eef80c2c 622ab6a34f 3a5034b5e0 c76164ea02 Use gendef instead of pexports for building windows .def files
* [RFC] building postgres with meson
@ 2021-10-12 08:37 Andres Freund <andres@anarazel.de>
2021-10-12 09:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 15:08 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-09 10:06 ` Re: [RFC] building postgres with meson Joel Jacobson <joel@compiler.org>
2022-03-09 16:55 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-09 07:10 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 12 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-12 08:37 UTC (permalink / raw)
To: pgsql-hackers
Hi,
For the last year or so I've on and off tinkered with $subject. I think
it's in a state worth sharing now. First, let's look at a little
comparison.
My workstation:
non-cached configure:
current: 11.80s
meson: 6.67s
non-cached build (world-bin):
current: 40.46s
ninja: 7.31s
no-change build:
current: 1.17s
ninja: 0.06s
test world:
current: 105s
meson: 63s
What actually started to motivate me however were the long times windows
builds took to come back with testsresults. On CI, with the same machine
config:
build:
current: 202s (doesn't include genbki etc)
meson+ninja: 140s
meson+msbuild: 206s
test:
current: 1323s (many commands)
meson: 903s (single command)
(note that the test comparison isn't quite fair - there's a few tests
missing, but it's just small contrib ones afaik)
The biggest difference to me however is not the speed, but how readable
the output is.
Running the tests with meson in a terminal, shows the number of tests
that completed out of how many total, how much time has passed, how long
the currently running tests already have been running.
At the end of a testrun a count of tests is shown:
188/189 postgresql:tap+pg_basebackup / pg_basebackup/t/010_pg_basebackup.pl OK 39.51s 110 subtests passed
189/189 postgresql:isolation+snapshot_too_old / snapshot_too_old/isolation OK 62.93s
Ok: 188
Expected Fail: 0
Fail: 1
Unexpected Pass: 0
Skipped: 0
Timeout: 0
Full log written to /tmp/meson/meson-logs/testlog.txt
The log has the output of the tests and ends with:
Summary of Failures:
120/189 postgresql:tap+recovery / recovery/t/007_sync_rep.pl ERROR 7.16s (exit status 255 or signal 127 SIGinvalid)
Quite the difference to make check-world -jnn output.
So, now that the teasing is done, let me explain a bit what lead me down
this path:
Autoconf + make is not being actively developed. Especially autoconf is
*barely* in maintenance mode - despite many shortcomings and bugs. It's
also technology that very few want to use - autoconf m4 is scary, and
it's scarier for people that started more recently than a lot of us
committers for example.
Recursive make as we use it is hard to get right. One reason the clean
make build is so slow compared to meson is that we had to resort to
.NOTPARALLEL to handle dependencies in a bunch of places. And despite
that, I quite regularly see incremental build failures that can be
resolved by retrying the build.
While we have incremental build via --enable-depend, they don't work
that reliable (i.e. misses necessary rebuilds) and yet is often too
aggressive. More modern build system can keep track of the precise
command used to build a target and rebuild it when that command changes.
We also don't just have the autoconf / make buildsystem, there's also
the msvc project generator - something most of us unix-y folks do not
like to touch. I think that, combined with there being no easy way to
run all tests, and it being just different, really hurt our windows
developer appeal (and subsequently the quality of postgres on
windows). I'm not saying this to ding the project generator - that was
well before there were decent "meta" buildsystems out there (and in some
ways it is a small one itself).
The last big issue I have with the current situation is that there's no
good test integration. make check-world output is essentially unreadable
/ not automatically parseable. Which led to the buildfarm having a
separate list of things it needs to test, so that failures can be
pinpointed and paired with appropriate logs. That approach unfortunately
doesn't scale well to multi-core CPUs, slowing down the buildfarm by a
fair bit.
This all led to me to experiment with improvements. I tried a few
somewhat crazy but incremental things like converting our buildsystem to
non-recursive make (I got it to build the backend, but it's too hard to
do manually I think), or to not run tests during the recursive make
check-world, but to append commands to a list of tests, that then is run
by a helper (can kinda be made to work). In the end I concluded that
the amount of time we'd need to invest to maintain our more-and-more
custom buildsystem going forward doesn't make sense.
Which lead me to look around and analyze which other buildsystems there
are that could make some sense for us. The halfway decent list includes,
I think:
1) cmake
2) bazel
3) meson
cmake would be a decent choice, I think. However, I just can't fully
warm up to it. Something about it just doesn't quite sit right with
me. That's not a good enough reason to prevent others from suggesting to
use it, but it's good enough to justify not investing a lot of time in
it myself.
Bazel has some nice architectural properties. But it requires a JVM to
run - I think that basically makes it insuitable for us. And the build
information seems quite arduous to maintain too.
Which left me with meson. It is a meta-buildsystem that can do the
actual work of building via ninja (the most common one, also targeted by
cmake), msbuild (visual studio project files, important for GUI work)
and xcode projects (I assume that's for a macos IDE, but I haven't tried
to use it). Meson roughly does what autoconf+automake did, in a
python-esque DSL, and outputs build-instructions for ninja / msbuild /
xcode. One interesting bit is that meson itself is written in python (
and fairly easy to contribute too - I got a few changes in now).
I don't think meson is perfect architecturally - e.g. its insistence on
not having functions ends up making it a bit harder to not end up
duplicating code. There's some user-interface oddities that are now hard
to fix fully, due to the faily wide usage. But all-in-all it's pretty
nice to use.
Its worth calling out that a lot of large open source projects have been
/ are migrating to meson. qemu/kvm, mesa (core part of graphics stack on
linux and also widely used in other platforms), a good chunk of GNOME,
and quite a few more. Due to that it seems unlikely to be abandoned
soon.
As far as I can tell the only OS that postgres currently supports that
meson doesn't support is HPUX. It'd likely be fairly easy to add
gcc-on-hpux support, a chunk more to add support for the proprietary
ones.
The attached patch (meson support is 0016, the rest is prerequisites
that aren't that interesting at this stage) converts most of postgres to
meson. There's a few missing contrib modules, only about half the
optional library dependencies are implemented, and I've only built on
x64. It builds on freebsd, linux, macos and windows (both ninja and
msbuild) and cross builds from linux to windows. Thomas helped make the
freebsd / macos pieces a reality, thanks!
I took a number of shortcuts (although there used to be a *lot*
more). So this shouldn't be reviewed to the normal standard of the
community - it's a prototype. But I think it's in a complete enough
shape that it allows to do a well-informed evaluation.
What doesn't yet work/ build:
- plenty optional libraries, contrib, NLS, docs build
- PGXS - and I don't yet know what to best do about it. One
backward-compatible way would be to continue use makefiles for pgxs,
but do the necessary replacement of Makefile.global.in via meson (and
not use that for postgres' own build). But that doesn't really
provide a nicer path for building postgres extensions on windows, so
it'd definitely not be a long-term path.
- JIT bitcode generation for anything but src/backend.
- anything but modern-ish x86. That's proably a small amount of work,
but something that needs to be done.
- exporting all symbols for extension modules on windows (the stuff for
postgres is implemented). Instead I marked the relevant symbols als
declspec(dllexport). I think we should do that regardless of the
buildsystem change. Restricting symbol visibility via gcc's
-fvisibility=hidden for extensions results in a substantially reduced
number of exported symbols, and even reduces object size (and I think
improves the code too). I'll send an email about that separately.
There's a lot more stuff to talk about, but I'll stop with a small bit
of instructions below:
Demo / instructions:
# Get code
git remote add andres git@github.com:anarazel/postgres.git
git fetch andres
git checkout --track andres/meson
# setup build directory
meson setup build --buildtype debug
cd build
# build (uses automatically as many cores as available)
ninja
# change configuration, build again
meson configure -Dssl=openssl
ninja
# run all tests
meson test
# run just recovery tests
meson test --suite setup --suite recovery
# list tests
meson test --list
Greetings,
Andres Freund
Attachments: download all (17 files, .tar.gz)
v3-0001-ci-backend-windows-DONTMERGE-crash-reporting-back.patch (text/x-diff, 1.4K) download
From a9b4a00a55d29fbfc96b81b0dd568a0cf9f61c20 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Thu, 9 Sep 2021 17:49:39 -0700
Subject: [PATCH v3 01/17] ci: backend: windows: DONTMERGE: crash reporting
(backend).
---
src/backend/main/main.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index ad84a45e28c..65a325723fd 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -26,6 +26,10 @@
#include <sys/param.h>
#endif
+#if defined(WIN32)
+#include <crtdbg.h>
+#endif
+
#if defined(_M_AMD64) && _MSC_VER == 1800
#include <math.h>
#include <versionhelpers.h>
@@ -238,7 +242,15 @@ startup_hacks(const char *progname)
}
/* In case of general protection fault, don't show GUI popup box */
- SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+ SetErrorMode(SEM_FAILCRITICALERRORS /* | SEM_NOGPFAULTERRORBOX */);
+
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+ _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+#ifndef __MINGW64__
+ _set_abort_behavior(_CALL_REPORTFAULT | _WRITE_ABORT_MSG, _CALL_REPORTFAULT | _WRITE_ABORT_MSG);
+#endif
#if defined(_M_AMD64) && _MSC_VER == 1800
--
2.23.0.385.gbc12974a89
v3-0002-ci-Add-CI-for-FreeBSD-Linux-MacOS-and-Windows-uti.patch (text/x-diff, 20.5K) download
From 7a364ae12c87f2523576f1a309ef688962f3d047 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 15 Mar 2021 09:25:15 -0700
Subject: [PATCH v3 02/17] ci: Add CI for FreeBSD, Linux, MacOS and Windows,
utilizing cirrus-ci.
---
.cirrus.yml | 395 ++++++++++++++++++++++++++++++++
.dockerignore | 3 +
ci/docker/linux_debian_bullseye | 13 ++
ci/docker/windows_vs_2019 | 105 +++++++++
ci/freebsd_gcp_repartition.sh | 28 +++
ci/pg_ci_base.conf | 12 +
ci/windows_build_config.pl | 10 +
7 files changed, 566 insertions(+)
create mode 100644 .cirrus.yml
create mode 100644 .dockerignore
create mode 100644 ci/docker/linux_debian_bullseye
create mode 100644 ci/docker/windows_vs_2019
create mode 100755 ci/freebsd_gcp_repartition.sh
create mode 100644 ci/pg_ci_base.conf
create mode 100644 ci/windows_build_config.pl
diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 00000000000..f75bdce6dec
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,395 @@
+env:
+ # accelerate initial clone, but a bit of depth so that concurrent tasks work
+ CIRRUS_CLONE_DEPTH: 100
+ # Useful to be able to analyse what in a script takes long
+ CIRRUS_LOG_TIMESTAMP: true
+ # target to test, for all but windows
+ CHECK: check-world
+ CHECKFLAGS: -Otarget
+ PGCTLTIMEOUT: 120
+ CCACHE_MAXSIZE: "500M"
+ TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/ci/pg_ci_base.conf
+ PG_TEST_EXTRA: kerberos ldap ssl
+
+
+task:
+ name: FreeBSD
+ only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*freebsd.*'
+ compute_engine_instance:
+ image_project: pg-vm-images-aio
+ image: family/pg-aio-freebsd-13-0
+ platform: freebsd
+ cpu: 2
+ memory: 2G
+ disk: 50
+ env:
+ CCACHE_DIR: "/tmp/ccache_dir"
+
+ ccache_cache:
+ folder: "/tmp/ccache_dir"
+ sysinfo_script:
+ - export || true
+ sysconfig_script:
+ - sudo sysctl kern.corefile='/tmp/%N.%P.core'
+ repartition_script:
+ - ci/freebsd_gcp_repartition.sh
+ create_user_script:
+ - pw useradd postgres
+ - chown -R postgres:postgres .
+ - mkdir -p /tmp/ccache_dir
+ - chown -R postgres:postgres /tmp/ccache_dir
+
+ configure_script: |
+ su postgres -c './configure \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ \
+ --with-lz4 \
+ --with-pam \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \
+ --with-uuid=bsd \
+ \
+ --with-includes=/usr/local/include --with-libs=/usr/local/lib \
+ CC="ccache cc"'
+ build_script:
+ - su postgres -c 'gmake -s -j3 && gmake -s -j3 -C contrib'
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - su postgres -c 'time gmake -s -j2 ${CHECK} ${CHECKFLAGS}'
+
+ on_failure:
+ cores_script: |
+ for corefile in $(find /tmp -name '*.core' 2>/dev/null) ; do
+ binary=$(gdb -quiet -core $corefile -batch -ex 'info auxv' | grep AT_EXECPATH | perl -pe "s/^.*\"(.*)\"\$/\$1/g") ;
+ echo dumping $corefile for $binary ;
+ gdb --batch --quiet -ex "thread apply all bt full" -ex "quit" $binary $corefile;
+ done
+ log_artifacts:
+ path: "**/**.log"
+ type: text/plain
+ regress_diffs_artifacts:
+ path: "**/**.diffs"
+ type: text/plain
+ tap_artifacts:
+ path: "**/regress_log_*"
+ type: text/plain
+
+
+task:
+ name: Linux
+ only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*linux.*'
+ compute_engine_instance:
+ image_project: pg-vm-images-aio
+ image: family/pg-aio-bullseye
+ platform: linux
+ cpu: 4
+ memory: 2G
+ nested_virtualization: false
+ env:
+ CCACHE_DIR: "/tmp/ccache_dir"
+ DEBUGINFOD_URLS: "https://debuginfod.debian.net"
+
+ ccache_cache:
+ folder: "/tmp/ccache_dir"
+
+ sysinfo_script:
+ - id
+ - uname -a
+ - cat /proc/cmdline
+ - lsblk
+ - ulimit -a -H
+ - ulimit -a -S
+ - export
+ sysconfig_script:
+ - useradd -m postgres
+ - chown -R postgres:postgres .
+ - mkdir -p /tmp/ccache_dir
+ - chown -R postgres:postgres /tmp/ccache_dir
+ - echo '* - memlock 134217728' > /etc/security/limits.d/postgres.conf
+ - su postgres -c 'ulimit -l -H'
+ - su postgres -c 'ulimit -l -S'
+ - echo '/tmp/%e-%s-%p.core' > /proc/sys/kernel/core_pattern
+
+ configure_script: |
+ su postgres -c './configure \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-gssapi \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ --with-llvm \
+ --with-lz4 \
+ --with-pam \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-systemd \
+ --with-tcl --with-tclconfig=/usr/lib/tcl8.6/ \
+ --with-uuid=e2fs \
+ \
+ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" CFLAGS="-O0 -ggdb"'
+ build_script:
+ - su postgres -c 'make -s -j4 && make -s -j4 -C contrib'
+ upload_caches:
+ - ccache
+
+ tests_script: |
+ su postgres -c '\
+ ulimit -c unlimited; \
+ make -s ${CHECK} ${CHECKFLAGS} -j8 \
+ '
+
+ on_failure:
+ cores_script: |
+ for corefile in $(find /tmp -name '*.core' 2>/dev/null) ; do
+ binary=$(gdb -quiet -core $corefile -batch -ex 'info auxv' | grep AT_EXECFN | perl -pe "s/^.*\"(.*)\"\$/\$1/g") ;
+ echo dumping $corefile for $binary ;
+ gdb --batch --quiet -ex "thread apply all bt full" -ex "quit" $binary $corefile ;
+ done
+ log_artifacts:
+ path: "**/**.log"
+ type: text/plain
+ regress_diffs_artifacts:
+ path: "**/**.diffs"
+ type: text/plain
+ tap_artifacts:
+ path: "**/regress_log_*"
+ type: text/plain
+
+
+task:
+ name: macOS
+ only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*(macos|darwin|osx).*'
+ osx_instance:
+ image: big-sur-base
+ env:
+ CIRRUS_WORKING_DIR: ${HOME}/pgsql/
+ TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/ci/pg_ci_base.conf
+ CCACHE_DIR: ${HOME}/ccache
+ HOMEBREW_CACHE: ${HOME}/homebrew-cache
+ PERL5LIB: ${HOME}/perl5/lib/perl5
+
+ sysinfo_script:
+ - id
+ - export
+ ccache_cache:
+ folder: ${CCACHE_DIR}
+ homebrew_cache:
+ folder: ${HOMEBREW_CACHE}
+ perl_cache:
+ folder: ~/perl5
+
+ cpan_install_script:
+ - perl -mIPC::Run -e 1 || cpan -T IPC::Run
+ - perl -mIO::Pty -e 1 || cpan -T IO::Pty
+ upload_caches:
+ - perl
+ core_install_script:
+ - sudo chmod 777 /cores
+ homebrew_install_script:
+ - brew install make coreutils ccache icu4c lz4 tcl-tk openldap
+ upload_caches:
+ - homebrew
+
+ configure_script: |
+ LIBS="/usr/local/lib:$LIBS"
+ INCLUDES="/usr/local/include:$INCLUDES"
+
+ INCLUDES="/usr/local/opt/openssl/include:$INCLUDES"
+ LIBS="/usr/local/opt/openssl/lib:$LIBS"
+
+ PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
+ INCLUDES="/usr/local/opt/icu4c/include:$INCLUDES"
+ LIBS="/usr/local/opt/icu4c/lib:$LIBS"
+
+ LIBS="/usr/local/opt/openldap/lib:$LIBS"
+ INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
+
+ export PKG_CONFIG_PATH
+
+ ./configure \
+ --prefix=$HOME/install \
+ --with-includes="$INCLUDES" \
+ --with-libs="$LIBS" \
+ \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ \
+ --with-lz4 \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-tcl --with-tclconfig=/usr/local/opt/tcl-tk/lib/ \
+ --with-uuid=e2fs \
+ \
+ CC="ccache gcc" CFLAGS="-O0 -ggdb"
+ build_script:
+ - gmake -s -j12 && gmake -s -j12 -C contrib
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - ulimit -c unlimited
+ - ulimit -n 1024
+ - gmake -s -j12 ${CHECK} ${CHECKFLAGS}
+
+ on_failure:
+ cores_script: |
+ for corefile in $(find /cores/ -name 'core.*' 2>/dev/null) ; do
+ lldb -c $corefile --batch -o 'thread backtrace all' -o 'quit' ;
+ done
+ log_artifacts:
+ path: "**/**.log"
+ type: text/plain
+ regress_diffs_artifacts:
+ path: "**/**.diffs"
+ type: text/plain
+ tap_artifacts:
+ path: "**/regress_log_*"
+ type: text/plain
+
+
+task:
+ name: Windows
+ only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
+ windows_container:
+ dockerfile: ci/docker/windows_vs_2019
+ cpu: 4
+ memory: 4G
+ env:
+ PROVE_FLAGS: -j10
+ # The default working dir is in a directory msbuild complains about
+ CIRRUS_WORKING_DIR: "c:/cirrus"
+ TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/ci/pg_ci_base.conf
+ # Avoid re-installing over and over
+ NO_TEMP_INSTALL: 1
+
+ sysinfo_script:
+ - chcp
+ - systeminfo
+ - powershell -Command get-psdrive -psprovider filesystem
+ - ps: Get-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug'
+ - set
+
+ configure_script:
+ - copy ci\windows_build_config.pl src\tools\msvc\config.pl
+ - vcvarsall x64
+ - perl src/tools/msvc/mkvcbuild.pl
+ build_script:
+ - vcvarsall x64
+ # Disable file tracker, we're never going to rebuild...
+ - msbuild -m /p:TrackFileAccess=false pgsql.sln
+ tempinstall_script:
+ # Installation on windows currently only completely works from src\tools\msvc
+ - cd src\tools\msvc && perl .\install.pl %CIRRUS_WORKING_DIR%\tmp_install
+
+ check_test_script:
+ - perl src/tools/msvc/vcregress.pl check parallel
+ startcreate_test_script:
+ - tmp_install\bin\pg_ctl.exe initdb -D tmp_check\db -l tmp_check\initdb.log
+ - echo include '%TEMP_CONFIG%' >> tmp_check\db\postgresql.conf
+ - tmp_install\bin\pg_ctl.exe start -D tmp_check\db -l tmp_check\postmaster.log
+ plcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl plcheck
+ isolationcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl isolationcheck
+ modulescheck_test_script:
+ - perl src/tools/msvc/vcregress.pl modulescheck
+ contribcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl contribcheck
+ stop_test_script:
+ - tmp_install\bin\pg_ctl.exe stop -D tmp_check\db -l tmp_check\postmaster.log
+ ssl_test_script:
+ - set with_ssl=openssl
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\ssl\
+ subscriptioncheck_test_script:
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\subscription\
+ authentication_test_script:
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\authentication\
+ recoverycheck_test_script:
+ - perl src/tools/msvc/vcregress.pl recoverycheck
+ bincheck_test_script:
+ - perl src/tools/msvc/vcregress.pl bincheck
+ upgradecheck_test_script:
+ - perl src/tools/msvc/vcregress.pl upgradecheck
+ ecpgcheck_test_script:
+ # tries to build additional stuff
+ - vcvarsall x64
+ # References ecpg_regression.proj in the current dir
+ - cd src\tools\msvc
+ - perl vcregress.pl ecpgcheck
+
+ always:
+ cores_script:
+ - cat crashlog.txt || true
+ dump_artifacts:
+ path: "crashlog.txt"
+ type: text/plain
+
+ on_failure:
+ log_artifacts:
+ path: "**/**.log"
+ type: text/plain
+ regress_diffs_artifacts:
+ path: "**/**.diffs"
+ type: text/plain
+ tap_artifacts:
+ path: "**/regress_log_*"
+ type: text/plain
+
+
+task:
+ name: CompilerWarnings
+ depends_on:
+ - Linux
+ # task that did not run count as a success, so we need to recheck Linux' condition here :/
+ only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*linux.*'
+ container:
+ dockerfile: ci/docker/linux_debian_bullseye
+ env:
+ CCACHE_SIZE: "4GB"
+ CCACHE_DIR: "/tmp/ccache_dir"
+ ccache_cache:
+ folder: "/tmp/ccache_dir"
+ setup_script:
+ - echo "COPT=-Werror" > src/Makefile.custom
+ - gcc -v
+ - clang -v
+ # gcc with asserts disabled
+ always:
+ gcc_warning_script:
+ - ./configure --cache gcc.cache CC="ccache gcc"
+ - time make -s -j4 clean && time make -s -j4
+ # gcc with asserts enabled
+ always:
+ gcc_a_warning_script:
+ - ./configure --cache gcc.cache --enable-cassert CC="ccache gcc"
+ - time make -s -j4 clean && time make -s -j4
+ # clang with asserts disabled
+ always:
+ clang_warning_script:
+ - ./configure --cache clang.cache CC="ccache clang"
+ - time make -s -j4 clean && time make -s -j4
+ # clang with asserts enabled
+ always:
+ clang_a_warning_script:
+ - ./configure --cache clang.cache --enable-cassert CC="ccache clang"
+ - time make -s -j4 clean && time make -s -j4
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..3fceab2e97b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+# Ignore everything, except ci/
+*
+!ci/*
diff --git a/ci/docker/linux_debian_bullseye b/ci/docker/linux_debian_bullseye
new file mode 100644
index 00000000000..f6c1782f16b
--- /dev/null
+++ b/ci/docker/linux_debian_bullseye
@@ -0,0 +1,13 @@
+FROM debian:bullseye
+RUN \
+ apt-get -y update && \
+ apt-get -y upgrade && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ git build-essential gcc g++ libreadline-dev flex bison make perl libipc-run-perl \
+ libio-pty-perl clang llvm-dev libperl-dev libpython3-dev tcl-dev libldap2-dev \
+ libicu-dev docbook-xml docbook-xsl fop libxml2-utils xsltproc krb5-admin-server \
+ krb5-kdc krb5-user slapd ldap-utils libssl-dev pkg-config locales-all liblz4-dev \
+ libsystemd-dev libxml2-dev libxslt1-dev python3-dev libkrb5-dev libpam-dev \
+ libkrb5-*-heimdal uuid-dev gettext \
+ liburing-dev python3-distutils ccache && \
+ apt-get clean
diff --git a/ci/docker/windows_vs_2019 b/ci/docker/windows_vs_2019
new file mode 100644
index 00000000000..e09ca0d5825
--- /dev/null
+++ b/ci/docker/windows_vs_2019
@@ -0,0 +1,105 @@
+# escape=`
+
+# We used to use the visual studio container, but it's too outdated now
+FROM cirrusci/windowsservercore:2019
+
+SHELL ["powershell", "-NoLogo", "-NoProfile", "-Command"]
+
+
+RUN `
+ New-Item -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio' ; `
+ New-Item -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio\Setup' ; `
+ New-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio\Setup' -Name KeepDownloadedPayloads -Value 0 -PropertyType DWord
+
+
+# Install commandline debugger and log all crashes to c:\cirrus\crashlog.txt
+#
+# Done manually as doing this via chocolatey / the installer directly, ends up
+# with a lot of unnecessary chaff, making the layer unnecessarily large.
+RUN `
+ mkdir c:\t ; `
+ cd c:\t ; `
+ curl.exe -sSL -o 'windsdksetup.exe' https://download.microsoft.com/download/9/7/9/97982c1d-d687-41be-9dd3-6d01e52ceb68/windowssdk/winsdksetup.exe ; `
+ Start-Process -Wait -FilePath ".\windsdksetup.exe" `
+ -ArgumentList '/Features OptionId.WindowsDesktopDebuggers /layout c:\t\sdk /quiet /norestart /log c:\t\sdk.log' `
+ ; `
+ `
+ Start-Process -Wait -FilePath msiexec.exe `
+ -ArgumentList '/a \"C:\t\sdk\Installers\X64 Debuggers And Tools-x64_en-us.msi\" /qb /log install2.log' `
+ ; `
+ C:\Windows` Kits\10\Debuggers\x64\cdb.exe -version ; `
+ `
+ cd c:\ ; `
+ Remove-Item C:\t\* -Force -Recurse ; `
+ Remove-Item C:\t -Force -Recurse ; `
+ Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name 'Debugger' -Value '\"C:\Windows Kits\10\Debuggers\x64\cdb.exe\" -p %ld -e %ld -g -kqm -c \".lines -e; .symfix+ ;.logappend c:\cirrus\crashlog.txt ; !peb; ~*kP ; .logclose ; q \"' ; `
+ New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name 'Auto' -Value 1 -PropertyType DWord ; `
+ Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name Debugger; `
+ setx PATH \"C:\Windows Kits\10\Debuggers\x64;$Env:PATH\" /m
+
+
+# Install perl, python, flex and bison.
+#
+# Done manually as choco takes a lot longer. I think it's download issues with
+# powershell's download stuff? That's wy curl.exe is directly used here at least...
+#
+# Using perl 5.26.3.1 for now, as newer versions don't currently work correctly
+RUN `
+ mkdir c:\t ; `
+ cd c:\t ; `
+ `
+ curl.exe -sSL -o perl.zip `
+ https://strawberryperl.com/download/5.26.3.1/strawberry-perl-5.26.3.1-64bit-portable.zip ; `
+ 7z.exe x .\perl.zip -xr!c -oc:\strawberry ; `
+ `
+ curl.exe -sSL -o python.exe https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe ; `
+ Start-Process -Wait -FilePath ".\python.exe" `
+ -ArgumentList `
+ '/quiet', 'SimpleInstall=1', 'PrependPath=1', 'CompileAll=1', `
+ 'TargetDir=c:\python\', 'InstallAllUsers=1', 'Shortcuts=0', `
+ 'Include_docs=0', 'Include_tcltk=0', 'Include_tests=0' `
+ ; `
+ `
+ curl.exe -sSL -o winflexbison.zip `
+ https://github.com/lexxmark/winflexbison/releases/download/v2.5.24/win_flex_bison-2.5.24.zip ; `
+ 7z.exe x .\winflexbison.zip -oc:\winflexbison ; `
+ Rename-Item -Path c:\winflexbison\win_flex.exe c:\winflexbison\flex.exe ; `
+ Rename-Item -Path c:\winflexbison\win_bison.exe c:\winflexbison\bison.exe ; `
+ `
+ cd c:\ ; `
+ Remove-Item C:\t -Force -Recurse ; `
+ setx PATH \"C:\strawberry\perl\bin;C:\winflexbison;C:\Program Files\Git\usr\bin;$Env:PATH\" /m
+
+
+# Install visual studio
+#
+# Adding VS path to vcvarsall.bat so user of container doesn't need to know the full path
+RUN `
+ mkdir c:\t ; `
+ cd c:\t ; `
+ curl.exe -sSL -o c:\t\vs_buildtools.exe https://aka.ms/vs/16/release/vs_buildtools.exe ; `
+ Start-Process -Wait `
+ -FilePath c:\t\vs_buildtools.exe `
+ -ArgumentList `
+ '--quiet', '--wait', '--norestart', '--nocache', `
+ '--installPath', 'c:\BuildTools', `
+ '--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', `
+ '--add', 'Microsoft.VisualStudio.Component.Windows10SDK.20348' ; `
+ cd c:\ ; `
+ Remove-Item C:\t -Force -Recurse ; `
+ Remove-Item -Force -Recurse ${Env:TEMP}\*; `
+ Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\" ; `
+ setx PATH \"c:\BuildTools\VC\Auxiliary\Build;$Env:PATH\" /m
+
+
+# Install openssl
+RUN `
+ mkdir c:\t ; `
+ cd c:\t ; `
+ `
+ curl.exe -o openssl-setup.exe -sSL https://slproweb.com/download/Win64OpenSSL-1_1_1L.exe ; `
+ Start-Process -Wait -FilePath ".\openssl-setup.exe" `
+ -ArgumentList '/DIR=c:\openssl\1.1.1l\ /VERYSILENT /SP- /SUPPRESSMSGBOXES' ; `
+ `
+ cd c:\ ; `
+ Remove-Item C:\t -Force -Recurse
diff --git a/ci/freebsd_gcp_repartition.sh b/ci/freebsd_gcp_repartition.sh
new file mode 100755
index 00000000000..2d5e1738998
--- /dev/null
+++ b/ci/freebsd_gcp_repartition.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+set -x
+
+# The default filesystem on freebsd gcp images is very slow to run tests on,
+# due to its 32KB block size
+#
+# XXX: It'd probably better to fix this in the image, using something like
+# https://people.freebsd.org/~lidl/blog/re-root.html
+
+# fix backup partition table after resize
+gpart recover da0
+gpart show da0
+# kill swap, so we can delete a partition
+swapoff -a || true
+# (apparently we can only have 4!?)
+gpart delete -i 3 da0
+gpart add -t freebsd-ufs -l data8k -a 4096 da0
+gpart show da0
+newfs -U -b 8192 /dev/da0p3
+
+# Migrate working directory
+du -hs $CIRRUS_WORKING_DIR
+mv $CIRRUS_WORKING_DIR $CIRRUS_WORKING_DIR.orig
+mkdir $CIRRUS_WORKING_DIR
+mount -o noatime /dev/da0p3 $CIRRUS_WORKING_DIR
+cp -r $CIRRUS_WORKING_DIR.orig/* $CIRRUS_WORKING_DIR/
diff --git a/ci/pg_ci_base.conf b/ci/pg_ci_base.conf
new file mode 100644
index 00000000000..637e3cfb343
--- /dev/null
+++ b/ci/pg_ci_base.conf
@@ -0,0 +1,12 @@
+# Tends to produce too many core files, taking a long time
+restart_after_crash = false
+
+# So that tests using the "manually" started postgres on windows can use
+# prepared statements
+max_prepared_transactions=10
+
+# Settings that make logs more useful
+log_line_prefix='%m [%p][%b][%v:%x] '
+log_checkpoints = true
+log_connections = true
+log_disconnections = true
diff --git a/ci/windows_build_config.pl b/ci/windows_build_config.pl
new file mode 100644
index 00000000000..bf0660416fa
--- /dev/null
+++ b/ci/windows_build_config.pl
@@ -0,0 +1,10 @@
+use strict;
+use warnings;
+
+our $config;
+
+$config->{"tap_tests"} = 1;
+$config->{"asserts"} = 1;
+$config->{"openssl"} = "c:/openssl/1.1.1l/";
+
+1;
--
2.23.0.385.gbc12974a89
v3-0003-fixup-ci-Add-CI-for-FreeBSD-Linux-MacOS-and-Windo.patch (text/x-diff, 5.8K) download
From dadd0b04a94be8bd1b3f3dba1ce378bcdadbd2f9 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Fri, 8 Oct 2021 23:29:08 -0700
Subject: [PATCH v3 03/17] fixup! ci: Add CI for FreeBSD, Linux, MacOS and
Windows, utilizing cirrus-ci.
---
ci/docker/windows_vs_2019 | 62 +++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/ci/docker/windows_vs_2019 b/ci/docker/windows_vs_2019
index e09ca0d5825..a4fcaceae96 100644
--- a/ci/docker/windows_vs_2019
+++ b/ci/docker/windows_vs_2019
@@ -6,12 +6,6 @@ FROM cirrusci/windowsservercore:2019
SHELL ["powershell", "-NoLogo", "-NoProfile", "-Command"]
-RUN `
- New-Item -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio' ; `
- New-Item -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio\Setup' ; `
- New-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\VisualStudio\Setup' -Name KeepDownloadedPayloads -Value 0 -PropertyType DWord
-
-
# Install commandline debugger and log all crashes to c:\cirrus\crashlog.txt
#
# Done manually as doing this via chocolatey / the installer directly, ends up
@@ -19,7 +13,11 @@ RUN `
RUN `
mkdir c:\t ; `
cd c:\t ; `
+ `
+ setx PATH \"C:\Windows Kits\10\Debuggers\x64;$Env:PATH\" /m ; `
+ `
curl.exe -sSL -o 'windsdksetup.exe' https://download.microsoft.com/download/9/7/9/97982c1d-d687-41be-9dd3-6d01e52ceb68/windowssdk/winsdksetup.exe ; `
+ echo 'starting sdk installation (for debugger)' ; `
Start-Process -Wait -FilePath ".\windsdksetup.exe" `
-ArgumentList '/Features OptionId.WindowsDesktopDebuggers /layout c:\t\sdk /quiet /norestart /log c:\t\sdk.log' `
; `
@@ -29,13 +27,12 @@ RUN `
; `
C:\Windows` Kits\10\Debuggers\x64\cdb.exe -version ; `
`
- cd c:\ ; `
- Remove-Item C:\t\* -Force -Recurse ; `
- Remove-Item C:\t -Force -Recurse ; `
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name 'Debugger' -Value '\"C:\Windows Kits\10\Debuggers\x64\cdb.exe\" -p %ld -e %ld -g -kqm -c \".lines -e; .symfix+ ;.logappend c:\cirrus\crashlog.txt ; !peb; ~*kP ; .logclose ; q \"' ; `
New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name 'Auto' -Value 1 -PropertyType DWord ; `
- Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name Debugger; `
- setx PATH \"C:\Windows Kits\10\Debuggers\x64;$Env:PATH\" /m
+ Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug' -Name Debugger ; `
+ `
+ cd c:\ ; `
+ Remove-Item C:\t -Force -Recurse
# Install perl, python, flex and bison.
@@ -48,11 +45,16 @@ RUN `
mkdir c:\t ; `
cd c:\t ; `
`
+ echo 'adding to path, before setup below, so changes are not overwritten' ; `
+ setx PATH \"C:\strawberry\perl\bin;C:\winflexbison;C:\Program Files\Git\usr\bin;$Env:PATH\" /m ; `
+ `
curl.exe -sSL -o perl.zip `
https://strawberryperl.com/download/5.26.3.1/strawberry-perl-5.26.3.1-64bit-portable.zip ; `
+ echo 'installing perl' ; `
7z.exe x .\perl.zip -xr!c -oc:\strawberry ; `
`
curl.exe -sSL -o python.exe https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe ; `
+ echo 'installing python' ; `
Start-Process -Wait -FilePath ".\python.exe" `
-ArgumentList `
'/quiet', 'SimpleInstall=1', 'PrependPath=1', 'CompileAll=1', `
@@ -62,13 +64,27 @@ RUN `
`
curl.exe -sSL -o winflexbison.zip `
https://github.com/lexxmark/winflexbison/releases/download/v2.5.24/win_flex_bison-2.5.24.zip ; `
+ echo 'installing winflexbison' ; `
7z.exe x .\winflexbison.zip -oc:\winflexbison ; `
Rename-Item -Path c:\winflexbison\win_flex.exe c:\winflexbison\flex.exe ; `
Rename-Item -Path c:\winflexbison\win_bison.exe c:\winflexbison\bison.exe ; `
`
cd c:\ ; `
- Remove-Item C:\t -Force -Recurse ; `
- setx PATH \"C:\strawberry\perl\bin;C:\winflexbison;C:\Program Files\Git\usr\bin;$Env:PATH\" /m
+ Remove-Item C:\t -Force -Recurse
+
+
+# Install openssl
+RUN `
+ mkdir c:\t ; `
+ cd c:\t ; `
+ `
+ curl.exe -o openssl-setup.exe -sSL https://slproweb.com/download/Win64OpenSSL-1_1_1L.exe ; `
+ echo 'staring openssl installation' ; `
+ Start-Process -Wait -FilePath ".\openssl-setup.exe" `
+ -ArgumentList '/DIR=c:\openssl\1.1.1l\ /VERYSILENT /SP- /SUPPRESSMSGBOXES' ; `
+ `
+ cd c:\ ; `
+ Remove-Item C:\t -Force -Recurse
# Install visual studio
@@ -77,7 +93,10 @@ RUN `
RUN `
mkdir c:\t ; `
cd c:\t ; `
+ setx PATH \"c:\BuildTools\VC\Auxiliary\Build;$Env:PATH\" /m ; `
+ `
curl.exe -sSL -o c:\t\vs_buildtools.exe https://aka.ms/vs/16/release/vs_buildtools.exe ; `
+ echo 'starting visual studio installation' ; `
Start-Process -Wait `
-FilePath c:\t\vs_buildtools.exe `
-ArgumentList `
@@ -85,21 +104,8 @@ RUN `
'--installPath', 'c:\BuildTools', `
'--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', `
'--add', 'Microsoft.VisualStudio.Component.Windows10SDK.20348' ; `
+ `
cd c:\ ; `
Remove-Item C:\t -Force -Recurse ; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
- Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\" ; `
- setx PATH \"c:\BuildTools\VC\Auxiliary\Build;$Env:PATH\" /m
-
-
-# Install openssl
-RUN `
- mkdir c:\t ; `
- cd c:\t ; `
- `
- curl.exe -o openssl-setup.exe -sSL https://slproweb.com/download/Win64OpenSSL-1_1_1L.exe ; `
- Start-Process -Wait -FilePath ".\openssl-setup.exe" `
- -ArgumentList '/DIR=c:\openssl\1.1.1l\ /VERYSILENT /SP- /SUPPRESSMSGBOXES' ; `
- `
- cd c:\ ; `
- Remove-Item C:\t -Force -Recurse
+ Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"
--
2.23.0.385.gbc12974a89
v3-0004-meson-prereq-output-and-depencency-tracking-work.patch (text/x-diff, 8.7K) download
From 3c0caccb8d9686538385cbb617a73a2d9b2476bd Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 8 Mar 2021 13:47:39 -0800
Subject: [PATCH v3 04/17] meson: prereq: output and depencency tracking work.
---
src/backend/utils/misc/Makefile | 5 ++++-
src/backend/utils/misc/guc.c | 2 +-
src/bin/initdb/initdb.c | 5 +++--
src/bin/psql/Makefile | 4 ++--
src/bin/psql/create_help.pl | 16 ++++++++++++----
src/tools/msvc/MSBuildProject.pm | 9 +++++++--
src/tools/msvc/Mkvcbuild.pm | 3 +++
src/tools/msvc/Solution.pm | 2 +-
src/tools/msvc/pgflex.pl | 4 ++--
9 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 1d5327cf644..14861fd96b2 100644
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -37,8 +37,11 @@ endif
include $(top_srcdir)/src/backend/common.mk
+guc-file.c.h: guc-file.l
+ flex -o $@ $<
+
# guc-file is compiled as part of guc
-guc.o: guc-file.c
+guc.o: guc-file.c.h
# Note: guc-file.c is not deleted by 'make clean',
# since we want to ship it in distribution tarballs.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d2ce4a84506..3786ae11a08 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -12559,4 +12559,4 @@ check_default_with_oids(bool *newval, void **extra, GucSource source)
return true;
}
-#include "guc-file.c"
+#include "guc-file.c.h"
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 1ed4808d53f..9067a06e58a 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1368,8 +1368,9 @@ bootstrap_template1(void)
if (strcmp(headerline, *bki_lines) != 0)
{
- pg_log_error("input file \"%s\" does not belong to PostgreSQL %s",
- bki_file, PG_VERSION);
+ pg_log_error("input file \"%s\" does not belong to PostgreSQL %s (expect %s, is %s)",
+ bki_file, PG_VERSION,
+ headerline, *bki_lines);
fprintf(stderr,
_("Check your installation or specify the correct path "
"using the option -L.\n"));
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index d00881163c0..3851da1c8ef 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -56,7 +56,7 @@ sql_help.c: sql_help.h
touch $@
sql_help.h: create_help.pl $(wildcard $(REFDOCDIR)/*.sgml)
- $(PERL) $< $(REFDOCDIR) $*
+ $(PERL) $< $(REFDOCDIR) . $*
psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
psqlscanslash.c: FLEX_NO_BACKUP=yes
@@ -81,7 +81,7 @@ clean distclean:
# files removed here are supposed to be in the distribution tarball,
# so do not clean them in the clean/distclean rules
maintainer-clean: distclean
- rm -f sql_help.h sql_help.c psqlscanslash.c
+ rm -f sql_help.h sql_help.c sql_help.dep psqlscanslash.c
check:
$(prove_check)
diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl
index 83324239740..40eb6ac2d3f 100644
--- a/src/bin/psql/create_help.pl
+++ b/src/bin/psql/create_help.pl
@@ -23,9 +23,12 @@ use strict;
use warnings;
my $docdir = $ARGV[0] or die "$0: missing required argument: docdir\n";
-my $hfile = $ARGV[1] . '.h'
+my $outdir = $ARGV[1] or die "$0: missing required argument: outdir\n";
+
+my $hfile = $ARGV[2] . '.h'
or die "$0: missing required argument: output file\n";
-my $cfile = $ARGV[1] . '.c';
+my $cfile = $ARGV[2] . '.c';
+my $depfile = $ARGV[2] . '.dep';
my $hfilebasename;
if ($hfile =~ m!.*/([^/]+)$!)
@@ -43,10 +46,12 @@ $define =~ s/\W/_/g;
opendir(DIR, $docdir)
or die "$0: could not open documentation source dir '$docdir': $!\n";
-open(my $hfile_handle, '>', $hfile)
+open(my $hfile_handle, '>', $outdir . '/' . $hfile)
or die "$0: could not open output file '$hfile': $!\n";
-open(my $cfile_handle, '>', $cfile)
+open(my $cfile_handle, '>', $outdir . '/' . $cfile)
or die "$0: could not open output file '$cfile': $!\n";
+open(my $depfile_handle, '>', $outdir . '/' . $depfile)
+ or die "$0: could not open output file '$depfile': $!\n";
print $hfile_handle "/*
* *** Do not change this file by hand. It is automatically
@@ -98,6 +103,8 @@ foreach my $file (sort readdir DIR)
my ($cmdid, @cmdnames, $cmddesc, $cmdsynopsis);
$file =~ /\.sgml$/ or next;
+ print $depfile_handle "$cfile $hfile: $docdir/$file\n";
+
open(my $fh, '<', "$docdir/$file") or next;
my $filecontent = join('', <$fh>);
close $fh;
@@ -216,4 +223,5 @@ print $hfile_handle "
close $cfile_handle;
close $hfile_handle;
+close $depfile_handle;
closedir DIR;
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index fdd22e89eb2..036e44fcb83 100644
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -211,14 +211,19 @@ EOF
}
else #if ($grammarFile =~ /\.l$/)
{
+ if ($outputFile eq 'src/backend/utils/misc/guc-file.c')
+ {
+ $outputFile = 'src/backend/utils/misc/guc-file.c.h';
+ }
+
print $f <<EOF;
<CustomBuild Include="$grammarFile">
<Message Condition="'\$(Configuration)|\$(Platform)'=='Debug|$self->{platform}'">Running flex on $grammarFile</Message>
- <Command Condition="'\$(Configuration)|\$(Platform)'=='Debug|$self->{platform}'">perl "src\\tools\\msvc\\pgflex.pl" "$grammarFile"</Command>
+ <Command Condition="'\$(Configuration)|\$(Platform)'=='Debug|$self->{platform}'">perl "src\\tools\\msvc\\pgflex.pl" "$grammarFile" "$outputFile"</Command>
<AdditionalInputs Condition="'\$(Configuration)|\$(Platform)'=='Debug|$self->{platform}'">%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'\$(Configuration)|\$(Platform)'=='Debug|$self->{platform}'">$outputFile;%(Outputs)</Outputs>
<Message Condition="'\$(Configuration)|\$(Platform)'=='Release|$self->{platform}'">Running flex on $grammarFile</Message>
- <Command Condition="'\$(Configuration)|\$(Platform)'=='Release|$self->{platform}'">perl "src\\tools\\msvc\\pgflex.pl" "$grammarFile"</Command>
+ <Command Condition="'\$(Configuration)|\$(Platform)'=='Release|$self->{platform}'">perl "src\\tools\\msvc\\pgflex.pl" "$grammarFile" "$outputFile"</Command>
<AdditionalInputs Condition="'\$(Configuration)|\$(Platform)'=='Release|$self->{platform}'">%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'\$(Configuration)|\$(Platform)'=='Release|$self->{platform}'">$outputFile;%(Outputs)</Outputs>
</CustomBuild>
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 4362bd44fd1..b8e62c6d3f7 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -330,6 +330,7 @@ sub mkvcbuild
$pgregress_ecpg->AddFile('src/test/regress/pg_regress.c');
$pgregress_ecpg->AddIncludeDir('src/port');
$pgregress_ecpg->AddIncludeDir('src/test/regress');
+ $pgregress_ecpg->AddDefine('DLSUFFIX=".dll"');
$pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress_ecpg->AddLibrary('ws2_32.lib');
$pgregress_ecpg->AddDirResourceFile('src/interfaces/ecpg/test');
@@ -345,6 +346,7 @@ sub mkvcbuild
$isolation_tester->AddIncludeDir('src/port');
$isolation_tester->AddIncludeDir('src/test/regress');
$isolation_tester->AddIncludeDir('src/interfaces/libpq');
+ $isolation_tester->AddDefine('DLSUFFIX=".dll"');
$isolation_tester->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$isolation_tester->AddLibrary('ws2_32.lib');
$isolation_tester->AddDirResourceFile('src/test/isolation');
@@ -356,6 +358,7 @@ sub mkvcbuild
$pgregress_isolation->AddFile('src/test/regress/pg_regress.c');
$pgregress_isolation->AddIncludeDir('src/port');
$pgregress_isolation->AddIncludeDir('src/test/regress');
+ $pgregress_isolation->AddDefine('DLSUFFIX=".dll"');
$pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress_isolation->AddLibrary('ws2_32.lib');
$pgregress_isolation->AddDirResourceFile('src/test/isolation');
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 165a93987ac..721f690ae46 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -688,7 +688,7 @@ sub GenerateFiles
{
print "Generating sql_help.h...\n";
chdir('src/bin/psql');
- system("perl create_help.pl ../../../doc/src/sgml/ref sql_help");
+ system("perl create_help.pl ../../../doc/src/sgml/ref . sql_help");
chdir('../../..');
}
diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
index 0728b85d4de..19f26ff213f 100644
--- a/src/tools/msvc/pgflex.pl
+++ b/src/tools/msvc/pgflex.pl
@@ -29,6 +29,8 @@ unless ($verparts[0] == 2
}
my $input = shift;
+my $output = shift;
+
if ($input !~ /\.l$/)
{
print "Input must be a .l file\n";
@@ -40,8 +42,6 @@ elsif (!-e $input)
exit 1;
}
-(my $output = $input) =~ s/\.l$/.c/;
-
# get flex flags from make file
my $makefile = dirname($input) . "/Makefile";
my ($mf, $make);
--
2.23.0.385.gbc12974a89
v3-0005-meson-prereq-move-snowball_create.sql-creation-in.patch (text/x-diff, 4.7K) download
From 3735dde29b192404e3e52c2989ec990a39d3e513 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 8 Mar 2021 14:59:22 -0800
Subject: [PATCH v3 05/17] meson: prereq: move snowball_create.sql creation
into perl file.
FIXME: deduplicate with Install.pm
---
src/backend/snowball/Makefile | 27 +-----
src/backend/snowball/snowball_create.pl | 110 ++++++++++++++++++++++++
2 files changed, 113 insertions(+), 24 deletions(-)
create mode 100644 src/backend/snowball/snowball_create.pl
diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index 50b9199910c..259104f8eb3 100644
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -119,29 +119,8 @@ all: all-shared-lib $(SQLSCRIPT)
include $(top_srcdir)/src/Makefile.shlib
-$(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
- echo '-- Language-specific snowball dictionaries' > $@
- cat $(srcdir)/snowball_func.sql.in >> $@
- @set -e; \
- set $(LANGUAGES) ; \
- while [ "$$#" -gt 0 ] ; \
- do \
- lang=$$1; shift; \
- nonascdictname=$$lang; \
- ascdictname=$$1; shift; \
- if [ -s $(srcdir)/stopwords/$${lang}.stop ] ; then \
- stop=", StopWords=$${lang}" ; \
- else \
- stop=""; \
- fi; \
- cat $(srcdir)/snowball.sql.in | \
- sed -e "s#_LANGNAME_#$$lang#g" | \
- sed -e "s#_DICTNAME_#$${lang}_stem#g" | \
- sed -e "s#_CFGNAME_#$$lang#g" | \
- sed -e "s#_ASCDICTNAME_#$${ascdictname}_stem#g" | \
- sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
- sed -e "s#_STOPWORDS_#$$stop#g" ; \
- done >> $@
+$(SQLSCRIPT): snowball_create.pl Makefile snowball_func.sql.in snowball.sql.in
+ $(PERL) $< --input ${srcdir} --output .
install: all installdirs install-lib
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
@@ -171,4 +150,4 @@ uninstall: uninstall-lib
done
clean distclean maintainer-clean: clean-lib
- rm -f $(OBJS) $(SQLSCRIPT)
+ rm -f $(OBJS) $(SQLSCRIPT) snowball_create.dep
diff --git a/src/backend/snowball/snowball_create.pl b/src/backend/snowball/snowball_create.pl
new file mode 100644
index 00000000000..d9d79f3668f
--- /dev/null
+++ b/src/backend/snowball/snowball_create.pl
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Getopt::Long;
+
+my $output_path = '';
+my $makefile_path = '';
+my $input_path = '';
+
+GetOptions(
+ 'output:s' => \$output_path,
+ 'input:s' => \$input_path) || usage();
+
+# Make sure input_path ends in a slash if needed.
+if ($input_path ne '' && substr($input_path, -1) ne '/')
+{
+ $output_path .= '/';
+}
+
+# Make sure output_path ends in a slash if needed.
+if ($output_path ne '' && substr($output_path, -1) ne '/')
+{
+ $output_path .= '/';
+}
+
+GenerateTsearchFiles();
+
+sub usage
+{
+ die <<EOM;
+Usage: snowball_create.pl --input/-i <path> --input <path>
+ --output Output directory (default '.')
+ --input Input directory
+
+snowball_create.pl creates snowball.sql from snowball.sql.in
+EOM
+}
+
+sub GenerateTsearchFiles
+{
+ my $target = shift;
+ my $output_file = "$output_path/snowball_create.sql";
+
+ print "Generating tsearch script...";
+ my $F;
+ my $D;
+ my $tmpl = read_file("$input_path/snowball.sql.in");
+ my $mf = read_file("$input_path/Makefile");
+
+ open($D, '>', "$output_path/snowball_create.dep")
+ || die "Could not write snowball_create.dep";
+
+ print $D "$output_file: $input_path/Makefile\n";
+ print $D "$output_file: $input_path/snowball.sql.in\n";
+ print $D "$output_file: $input_path/snowball_func.sql.in\n";
+
+ $mf =~ s{\\\r?\n}{}g;
+ $mf =~ /^LANGUAGES\s*=\s*(.*)$/m
+ || die "Could not find LANGUAGES line in snowball Makefile\n";
+ my @pieces = split /\s+/, $1;
+ open($F, '>', $output_file)
+ || die "Could not write snowball_create.sql";
+
+ print $F "-- Language-specific snowball dictionaries\n";
+
+ print $F read_file("$input_path/snowball_func.sql.in");
+
+ while ($#pieces > 0)
+ {
+ my $lang = shift @pieces || last;
+ my $asclang = shift @pieces || last;
+ my $txt = $tmpl;
+ my $stop = '';
+ my $stopword_path = "$input_path/stopwords/$lang.stop";
+
+ if (-s "$stopword_path")
+ {
+ $stop = ", StopWords=$lang";
+
+ print $D "$output_file: $stopword_path\n";
+ }
+
+ $txt =~ s#_LANGNAME_#${lang}#gs;
+ $txt =~ s#_DICTNAME_#${lang}_stem#gs;
+ $txt =~ s#_CFGNAME_#${lang}#gs;
+ $txt =~ s#_ASCDICTNAME_#${asclang}_stem#gs;
+ $txt =~ s#_NONASCDICTNAME_#${lang}_stem#gs;
+ $txt =~ s#_STOPWORDS_#$stop#gs;
+ print $F $txt;
+ print ".";
+ }
+ close($F);
+ close($D);
+ print "\n";
+ return;
+}
+
+
+sub read_file
+{
+ my $filename = shift;
+ my $F;
+ local $/ = undef;
+ open($F, '<', $filename) || die "Could not open file $filename\n";
+ my $txt = <$F>;
+ close($F);
+
+ return $txt;
+}
--
2.23.0.385.gbc12974a89
v3-0006-meson-prereq-add-output-path-arg-in-generate-lwlo.patch (text/x-diff, 1.6K) download
From ff46bc3dd368d11043d6089b2da2f82c1c28f631 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Wed, 10 Mar 2021 01:43:07 -0800
Subject: [PATCH v3 06/17] meson: prereq: add output path arg in
generate-lwlocknames.pl
---
src/backend/storage/lmgr/generate-lwlocknames.pl | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/backend/storage/lmgr/generate-lwlocknames.pl b/src/backend/storage/lmgr/generate-lwlocknames.pl
index 8a44946594d..315156b29f1 100644
--- a/src/backend/storage/lmgr/generate-lwlocknames.pl
+++ b/src/backend/storage/lmgr/generate-lwlocknames.pl
@@ -5,15 +5,21 @@
use strict;
use warnings;
+use Getopt::Long;
+
+my $output_path = '.';
my $lastlockidx = -1;
my $continue = "\n";
+GetOptions(
+ 'output:s' => \$output_path);
+
open my $lwlocknames, '<', $ARGV[0] or die;
# Include PID in suffix in case parallel make runs this multiple times.
-my $htmp = "lwlocknames.h.tmp$$";
-my $ctmp = "lwlocknames.c.tmp$$";
+my $htmp = "$output_path/lwlocknames.h.tmp$$";
+my $ctmp = "$output_path/lwlocknames.c.tmp$$";
open my $h, '>', $htmp or die "Could not open $htmp: $!";
open my $c, '>', $ctmp or die "Could not open $ctmp: $!";
@@ -65,7 +71,7 @@ printf $h "#define NUM_INDIVIDUAL_LWLOCKS %s\n", $lastlockidx + 1;
close $h;
close $c;
-rename($htmp, 'lwlocknames.h') || die "rename: $htmp: $!";
-rename($ctmp, 'lwlocknames.c') || die "rename: $ctmp: $!";
+rename($htmp, "$output_path/lwlocknames.h") || die "rename: $htmp to $output_path/lwlocknames.h: $!";
+rename($ctmp, "$output_path/lwlocknames.c") || die "rename: $ctmp: $!";
close $lwlocknames;
--
2.23.0.385.gbc12974a89
v3-0007-meson-prereq-add-src-tools-gen_versioning_script..patch (text/x-diff, 1.9K) download
From 442cee8d3c2b32d59696e2114f97de062f798293 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Wed, 10 Mar 2021 15:11:13 -0800
Subject: [PATCH v3 07/17] meson: prereq: add
src/tools/gen_versioning_script.pl.
Currently the logic is all in src/Makefile.shlib. This adds a sketch
of a generation script that can be used from meson.
---
src/tools/gen_versioning_script.pl | 58 ++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 src/tools/gen_versioning_script.pl
diff --git a/src/tools/gen_versioning_script.pl b/src/tools/gen_versioning_script.pl
new file mode 100644
index 00000000000..862b5e14aad
--- /dev/null
+++ b/src/tools/gen_versioning_script.pl
@@ -0,0 +1,58 @@
+use strict;
+use warnings;
+
+my $format = $ARGV[0] or die "$0: missing required argument: format\n";
+my $input = $ARGV[1] or die "$0: missing required argument: input\n";
+my $output = $ARGV[2] or die "$0: missing required argument: output\n";
+
+#FIXME: handle format argument, so we can reuse the one script for several platforms
+if (not ($format eq 'gnu' or $format eq 'darwin'))
+{
+ die "$0: $format is not yet handled (only gnu is)\n";
+}
+
+open(my $input_handle, '<', $input)
+ or die "$0: could not open input file '$input': $!\n";
+
+open(my $output_handle, '>', $output)
+ or die "$0: could not open output file '$output': $!\n";
+
+
+if ($format eq 'gnu')
+{
+ print $output_handle "{
+ global:
+";
+}
+
+while (<$input_handle>)
+{
+ if (/^#/)
+ {
+ # don't do anything with a comment
+ }
+ elsif (/^([^\s]+)\s+([^\s]+)/)
+ {
+ if ($format eq 'gnu')
+ {
+ print $output_handle " $1;\n";
+ }
+ elsif ($format eq 'darwin')
+ {
+ print $output_handle " _$1\n";
+ }
+ }
+ else
+ {
+ die "$0: unexpected line $_\n";
+ }
+}
+
+if ($format eq 'gnu')
+{
+ print $output_handle " local: *;
+};
+";
+}
+
+exit(0);
--
2.23.0.385.gbc12974a89
v3-0008-meson-prereq-generate-errcodes.pl-accept-output-f.patch (text/x-diff, 2.6K) download
From aa5915c8bab7ef119d34d350dbeaf17ec59c16e3 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 27 Sep 2021 00:14:09 -0700
Subject: [PATCH v3 08/17] meson: prereq: generate-errcodes.pl: accept output
file
---
src/backend/utils/Makefile | 2 +-
src/backend/utils/generate-errcodes.pl | 13 ++++++++-----
src/tools/msvc/Solution.pm | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index ef8df254826..469caf0d704 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -52,7 +52,7 @@ fmgr-stamp: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/ca
touch $@
errcodes.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-errcodes.pl
- $(PERL) $(srcdir)/generate-errcodes.pl $< > $@
+ $(PERL) $(srcdir)/generate-errcodes.pl $< $@
ifneq ($(enable_dtrace), yes)
probes.h: Gen_dummy_probes.sed
diff --git a/src/backend/utils/generate-errcodes.pl b/src/backend/utils/generate-errcodes.pl
index c5cdd388138..57ec2a5ca21 100644
--- a/src/backend/utils/generate-errcodes.pl
+++ b/src/backend/utils/generate-errcodes.pl
@@ -6,11 +6,13 @@
use strict;
use warnings;
-print
+open my $errcodes, '<', $ARGV[0] or die;
+open my $out, '>', $ARGV[1] or die;
+
+print $out
"/* autogenerated from src/backend/utils/errcodes.txt, do not edit */\n";
-print "/* there is deliberately not an #ifndef ERRCODES_H here */\n";
+print $out "/* there is deliberately not an #ifndef ERRCODES_H here */\n";
-open my $errcodes, '<', $ARGV[0] or die;
while (<$errcodes>)
{
@@ -25,7 +27,7 @@ while (<$errcodes>)
{
my $header = $1;
$header =~ s/^\s+//;
- print "\n/* $header */\n";
+ print $out "\n/* $header */\n";
next;
}
@@ -40,7 +42,8 @@ while (<$errcodes>)
# And quote them
$sqlstate =~ s/([^,])/'$1'/g;
- print "#define $errcode_macro MAKE_SQLSTATE($sqlstate)\n";
+ print $out "#define $errcode_macro MAKE_SQLSTATE($sqlstate)\n";
}
close $errcodes;
+close $out;
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 721f690ae46..aba59a270b4 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -658,7 +658,7 @@ sub GenerateFiles
{
print "Generating errcodes.h...\n";
system(
- 'perl src/backend/utils/generate-errcodes.pl src/backend/utils/errcodes.txt > src/backend/utils/errcodes.h'
+ 'perl src/backend/utils/generate-errcodes.pl src/backend/utils/errcodes.txt src/backend/utils/errcodes.h'
);
copyFile('src/backend/utils/errcodes.h',
'src/include/utils/errcodes.h');
--
2.23.0.385.gbc12974a89
v3-0009-meson-prereq-remove-unhelpful-chattiness-in-snowb.patch (text/x-diff, 1.0K) download
From f78a0f77bcb97fc1dc2fa6d9ee3143f8b95561d4 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Mon, 27 Sep 2021 15:41:24 -0700
Subject: [PATCH v3 09/17] meson: prereq: remove unhelpful chattiness in
snowball_create.pl.
---
src/backend/snowball/snowball_create.pl | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/backend/snowball/snowball_create.pl b/src/backend/snowball/snowball_create.pl
index d9d79f3668f..285cf4f5d90 100644
--- a/src/backend/snowball/snowball_create.pl
+++ b/src/backend/snowball/snowball_create.pl
@@ -42,7 +42,6 @@ sub GenerateTsearchFiles
my $target = shift;
my $output_file = "$output_path/snowball_create.sql";
- print "Generating tsearch script...";
my $F;
my $D;
my $tmpl = read_file("$input_path/snowball.sql.in");
@@ -88,11 +87,9 @@ sub GenerateTsearchFiles
$txt =~ s#_NONASCDICTNAME_#${lang}_stem#gs;
$txt =~ s#_STOPWORDS_#$stop#gs;
print $F $txt;
- print ".";
}
close($F);
close($D);
- print "\n";
return;
}
--
2.23.0.385.gbc12974a89
v3-0010-meson-prereq-Can-we-get-away-with-not-export-all-.patch (text/x-diff, 18.3K) download
From 8d3ca1659baf70926fb034f4043d3d90669f242b Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Wed, 29 Sep 2021 00:29:10 -0700
Subject: [PATCH v3 10/17] meson: prereq: Can we get away with not
export-all'ing libraries?
---
configure | 49 ++++++++++++++++++++++
configure.ac | 10 +++++
contrib/hstore/hstore.h | 16 +++----
contrib/ltree/ltree.h | 40 +++++++++---------
src/Makefile.global.in | 1 +
src/Makefile.shlib | 12 ++++++
src/include/c.h | 15 +++++--
src/include/fmgr.h | 6 ++-
src/include/jit/jit.h | 2 +-
src/include/pg_config.h.in | 3 ++
src/include/replication/output_plugin.h | 2 +
src/pl/plpython/plpy_elog.h | 8 ++--
src/pl/plpython/plpy_typeio.h | 18 ++++----
src/pl/plpython/plpy_util.h | 8 ++--
src/test/modules/test_shm_mq/test_shm_mq.h | 2 +-
src/test/modules/worker_spi/worker_spi.c | 2 +-
src/tools/msvc/Solution.pm | 1 +
17 files changed, 142 insertions(+), 53 deletions(-)
diff --git a/configure b/configure
index 4ffefe46552..a62008e5ac5 100755
--- a/configure
+++ b/configure
@@ -735,6 +735,7 @@ CPP
CFLAGS_SL
BITCODE_CXXFLAGS
BITCODE_CFLAGS
+CFLAGS_SL_MOD
CFLAGS_VECTORIZE
CFLAGS_UNROLL_LOOPS
PERMIT_DECLARATION_AFTER_STATEMENT
@@ -6421,6 +6422,54 @@ fi
if test -n "$NOT_THE_CFLAGS"; then
CFLAGS="$CFLAGS -Wno-stringop-truncation"
fi
+
+ # If the compiler knows how to hide symbols, use that. But only for shared libraries,
+ # for postgres itself that'd be too verbose for now.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -fvisibility=hidden, for CFLAGS_SL_MOD" >&5
+$as_echo_n "checking whether ${CC} supports -fvisibility=hidden, for CFLAGS_SL_MOD... " >&6; }
+if ${pgac_cv_prog_CC_cflags__fvisibility_hidden+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ pgac_save_CFLAGS=$CFLAGS
+pgac_save_CC=$CC
+CC=${CC}
+CFLAGS="${CFLAGS_SL_MOD} -fvisibility=hidden"
+ac_save_c_werror_flag=$ac_c_werror_flag
+ac_c_werror_flag=yes
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ pgac_cv_prog_CC_cflags__fvisibility_hidden=yes
+else
+ pgac_cv_prog_CC_cflags__fvisibility_hidden=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_c_werror_flag=$ac_save_c_werror_flag
+CFLAGS="$pgac_save_CFLAGS"
+CC="$pgac_save_CC"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__fvisibility_hidden" >&5
+$as_echo "$pgac_cv_prog_CC_cflags__fvisibility_hidden" >&6; }
+if test x"$pgac_cv_prog_CC_cflags__fvisibility_hidden" = x"yes"; then
+ CFLAGS_SL_MOD="${CFLAGS_SL_MOD} -fvisibility=hidden"
+fi
+
+
+ if test "$pgac_cv_prog_CC_cflags__fvisibility_hidden" = yes; then
+
+$as_echo "#define HAVE_VISIBILITY_ATTRIBUTE 1" >>confdefs.h
+
+ fi
+
elif test "$ICC" = yes; then
# Intel's compiler has a bug/misoptimization in checking for
# division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
diff --git a/configure.ac b/configure.ac
index 44ee3ebe2f1..973f83db52c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,6 +541,15 @@ if test "$GCC" = yes -a "$ICC" = no; then
if test -n "$NOT_THE_CFLAGS"; then
CFLAGS="$CFLAGS -Wno-stringop-truncation"
fi
+
+ # If the compiler knows how to hide symbols, use that. But only for shared libraries,
+ # for postgres itself that'd be too verbose for now.
+ PGAC_PROG_CC_VAR_OPT(CFLAGS_SL_MOD, [-fvisibility=hidden])
+ if test "$pgac_cv_prog_CC_cflags__fvisibility_hidden" = yes; then
+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, 1,
+ [Define to 1 if your compiler knows the visibility("hidden") attribute.])
+ fi
+
elif test "$ICC" = yes; then
# Intel's compiler has a bug/misoptimization in checking for
# division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
@@ -564,6 +573,7 @@ fi
AC_SUBST(CFLAGS_UNROLL_LOOPS)
AC_SUBST(CFLAGS_VECTORIZE)
+AC_SUBST(CFLAGS_SL_MOD)
# Determine flags used to emit bitcode for JIT inlining. Need to test
# for behaviour changing compiler flags, to keep compatibility with
diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h
index bf4a565ed9b..625134c9f69 100644
--- a/contrib/hstore/hstore.h
+++ b/contrib/hstore/hstore.h
@@ -147,7 +147,7 @@ typedef struct
} while (0)
/* DatumGetHStoreP includes support for reading old-format hstore values */
-extern HStore *hstoreUpgrade(Datum orig);
+extern PGDLLEXPORT HStore *hstoreUpgrade(Datum orig);
#define DatumGetHStoreP(d) hstoreUpgrade(d)
@@ -168,14 +168,14 @@ typedef struct
bool needfree; /* need to pfree the value? */
} Pairs;
-extern int hstoreUniquePairs(Pairs *a, int32 l, int32 *buflen);
-extern HStore *hstorePairs(Pairs *pairs, int32 pcount, int32 buflen);
+extern PGDLLEXPORT int hstoreUniquePairs(Pairs *a, int32 l, int32 *buflen);
+extern PGDLLEXPORT HStore *hstorePairs(Pairs *pairs, int32 pcount, int32 buflen);
-extern size_t hstoreCheckKeyLen(size_t len);
-extern size_t hstoreCheckValLen(size_t len);
+extern PGDLLEXPORT size_t hstoreCheckKeyLen(size_t len);
+extern PGDLLEXPORT size_t hstoreCheckValLen(size_t len);
-extern int hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen);
-extern Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
+extern PGDLLEXPORT int hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen);
+extern PGDLLEXPORT Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
#define HStoreContainsStrategyNumber 7
#define HStoreExistsStrategyNumber 9
@@ -194,7 +194,7 @@ extern Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
#if HSTORE_POLLUTE_NAMESPACE
#define HSTORE_POLLUTE(newname_,oldname_) \
PG_FUNCTION_INFO_V1(oldname_); \
- Datum newname_(PG_FUNCTION_ARGS); \
+ extern PGDLLEXPORT Datum newname_(PG_FUNCTION_ARGS); \
Datum oldname_(PG_FUNCTION_ARGS) { return newname_(fcinfo); } \
extern int no_such_variable
#else
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 5b4be5e680a..d8bcdedbdbe 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -176,30 +176,30 @@ typedef struct
/* use in array iterator */
-Datum ltree_isparent(PG_FUNCTION_ARGS);
-Datum ltree_risparent(PG_FUNCTION_ARGS);
-Datum ltq_regex(PG_FUNCTION_ARGS);
-Datum ltq_rregex(PG_FUNCTION_ARGS);
-Datum lt_q_regex(PG_FUNCTION_ARGS);
-Datum lt_q_rregex(PG_FUNCTION_ARGS);
-Datum ltxtq_exec(PG_FUNCTION_ARGS);
-Datum ltxtq_rexec(PG_FUNCTION_ARGS);
-Datum _ltq_regex(PG_FUNCTION_ARGS);
-Datum _ltq_rregex(PG_FUNCTION_ARGS);
-Datum _lt_q_regex(PG_FUNCTION_ARGS);
-Datum _lt_q_rregex(PG_FUNCTION_ARGS);
-Datum _ltxtq_exec(PG_FUNCTION_ARGS);
-Datum _ltxtq_rexec(PG_FUNCTION_ARGS);
-Datum _ltree_isparent(PG_FUNCTION_ARGS);
-Datum _ltree_risparent(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_isparent(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_risparent(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltq_regex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltq_rregex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum lt_q_regex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum lt_q_rregex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltxtq_exec(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltxtq_rexec(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltq_regex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltq_rregex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _lt_q_regex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _lt_q_rregex(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltxtq_exec(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltxtq_rexec(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltree_isparent(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum _ltree_risparent(PG_FUNCTION_ARGS);
/* Concatenation functions */
-Datum ltree_addltree(PG_FUNCTION_ARGS);
-Datum ltree_addtext(PG_FUNCTION_ARGS);
-Datum ltree_textadd(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_addltree(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_addtext(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_textadd(PG_FUNCTION_ARGS);
/* Util function */
-Datum ltree_in(PG_FUNCTION_ARGS);
+PGDLLEXPORT Datum ltree_in(PG_FUNCTION_ARGS);
bool ltree_execute(ITEM *curitem, void *checkval,
bool calcnot, bool (*chkcond) (void *checkval, ITEM *val));
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a1da1ea4eeb..a4ab27ae145 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -259,6 +259,7 @@ SUN_STUDIO_CC = @SUN_STUDIO_CC@
CXX = @CXX@
CFLAGS = @CFLAGS@
CFLAGS_SL = @CFLAGS_SL@
+CFLAGS_SL_MOD = @CFLAGS_SL_MOD@
CFLAGS_UNROLL_LOOPS = @CFLAGS_UNROLL_LOOPS@
CFLAGS_VECTORIZE = @CFLAGS_VECTORIZE@
CFLAGS_SSE42 = @CFLAGS_SSE42@
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 551023c6fb0..d36782aa942 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -253,6 +253,18 @@ ifeq ($(PORTNAME), win32)
endif
+# If the shared library doesn't have an export file, mark all symbols not
+# explicitly exported using PGDLLEXPORT as hidden. We can't pass these flags
+# when building a library with explicit exports, as the symbols would be
+# hidden before the linker script / exported symbol list takes effect.
+#
+# XXX: This probably isn't the best location, but not clear instead?
+ifeq ($(SHLIB_EXPORTS),)
+ LDFLAGS += $(CFLAGS_SL_MOD)
+ override CFLAGS += $(CFLAGS_SL_MOD)
+ override CXXFLAGS += $(CFLAGS_SL_MOD)
+endif
+
##
## BUILD
diff --git a/src/include/c.h b/src/include/c.h
index c8ede082739..9b539a2657b 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -1312,11 +1312,18 @@ extern long long strtoll(const char *str, char **endptr, int base);
extern unsigned long long strtoull(const char *str, char **endptr, int base);
#endif
-/* no special DLL markers on most ports */
-#ifndef PGDLLIMPORT
-#define PGDLLIMPORT
+/*
+ * If the platform knows __attribute__((visibility("*"))), i.e. gcc like
+ * compilers, we use that.
+ */
+#if !defined(PGDLLIMPORT) && defined(HAVE_VISIBILITY_ATTRIBUTE)
+#define PGDLLIMPORT __attribute__((visibility("default")))
+#define PGDLLEXPORT __attribute__((visibility("default")))
#endif
-#ifndef PGDLLEXPORT
+
+/* No special DLL markers on the remaining ports. */
+#if !defined(PGDLLIMPORT)
+#define PGDLLIMPORT
#define PGDLLEXPORT
#endif
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index ab7b85c86e1..679443cca19 100644
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -413,7 +413,7 @@ typedef const Pg_finfo_record *(*PGFInfoFunction) (void);
* info function, since authors shouldn't need to be explicitly aware of it.
*/
#define PG_FUNCTION_INFO_V1(funcname) \
-extern Datum funcname(PG_FUNCTION_ARGS); \
+extern PGDLLEXPORT Datum funcname(PG_FUNCTION_ARGS); \
extern PGDLLEXPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
const Pg_finfo_record * \
CppConcat(pg_finfo_,funcname) (void) \
@@ -424,6 +424,10 @@ CppConcat(pg_finfo_,funcname) (void) \
extern int no_such_variable
+extern PGDLLEXPORT void _PG_init(void);
+extern PGDLLEXPORT void _PG_fini(void);
+
+
/*-------------------------------------------------------------------------
* Support for verifying backend compatibility of loaded modules
*
diff --git a/src/include/jit/jit.h b/src/include/jit/jit.h
index b634df30b98..74617ad1b64 100644
--- a/src/include/jit/jit.h
+++ b/src/include/jit/jit.h
@@ -63,7 +63,7 @@ typedef struct JitContext
typedef struct JitProviderCallbacks JitProviderCallbacks;
-extern void _PG_jit_provider_init(JitProviderCallbacks *cb);
+extern PGDLLEXPORT void _PG_jit_provider_init(JitProviderCallbacks *cb);
typedef void (*JitProviderInit) (JitProviderCallbacks *cb);
typedef void (*JitProviderResetAfterErrorCB) (void);
typedef void (*JitProviderReleaseContextCB) (JitContext *context);
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 15ffdd895aa..e3ab1c7752f 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -710,6 +710,9 @@
/* Define to 1 if you have the <uuid/uuid.h> header file. */
#undef HAVE_UUID_UUID_H
+/* Define to 1 if your compiler knows the visibility("hidden") attribute. */
+#undef HAVE_VISIBILITY_ATTRIBUTE
+
/* Define to 1 if you have the `wcstombs_l' function. */
#undef HAVE_WCSTOMBS_L
diff --git a/src/include/replication/output_plugin.h b/src/include/replication/output_plugin.h
index 810495ed0e4..a087f14dadd 100644
--- a/src/include/replication/output_plugin.h
+++ b/src/include/replication/output_plugin.h
@@ -35,6 +35,8 @@ typedef struct OutputPluginOptions
*/
typedef void (*LogicalOutputPluginInit) (struct OutputPluginCallbacks *cb);
+extern PGDLLEXPORT void _PG_output_plugin_init(struct OutputPluginCallbacks *cb);
+
/*
* Callback that gets called in a user-defined plugin. ctx->private_data can
* be set to some private data.
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
index e02ef4ffe9f..aeade82ce10 100644
--- a/src/pl/plpython/plpy_elog.h
+++ b/src/pl/plpython/plpy_elog.h
@@ -34,13 +34,13 @@ extern PyObject *PLy_exc_spi_error;
} while(0)
#endif /* HAVE__BUILTIN_CONSTANT_P */
-extern void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
+extern PGDLLEXPORT void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
-extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3);
+extern PGDLLEXPORT void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3);
-extern void PLy_exception_set_plural(PyObject *exc, const char *fmt_singular, const char *fmt_plural,
+extern PGDLLEXPORT void PLy_exception_set_plural(PyObject *exc, const char *fmt_singular, const char *fmt_plural,
unsigned long n,...) pg_attribute_printf(2, 5) pg_attribute_printf(3, 5);
-extern void PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata);
+extern PGDLLEXPORT void PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata);
#endif /* PLPY_ELOG_H */
diff --git a/src/pl/plpython/plpy_typeio.h b/src/pl/plpython/plpy_typeio.h
index d11e6ae1b89..87e3b2c464e 100644
--- a/src/pl/plpython/plpy_typeio.h
+++ b/src/pl/plpython/plpy_typeio.h
@@ -147,29 +147,29 @@ struct PLyObToDatum
};
-extern PyObject *PLy_input_convert(PLyDatumToOb *arg, Datum val);
-extern Datum PLy_output_convert(PLyObToDatum *arg, PyObject *val,
+extern PGDLLEXPORT PyObject *PLy_input_convert(PLyDatumToOb *arg, Datum val);
+extern PGDLLEXPORT Datum PLy_output_convert(PLyObToDatum *arg, PyObject *val,
bool *isnull);
-extern PyObject *PLy_input_from_tuple(PLyDatumToOb *arg, HeapTuple tuple,
+extern PGDLLEXPORT PyObject *PLy_input_from_tuple(PLyDatumToOb *arg, HeapTuple tuple,
TupleDesc desc, bool include_generated);
-extern void PLy_input_setup_func(PLyDatumToOb *arg, MemoryContext arg_mcxt,
+extern PGDLLEXPORT void PLy_input_setup_func(PLyDatumToOb *arg, MemoryContext arg_mcxt,
Oid typeOid, int32 typmod,
struct PLyProcedure *proc);
-extern void PLy_output_setup_func(PLyObToDatum *arg, MemoryContext arg_mcxt,
+extern PGDLLEXPORT void PLy_output_setup_func(PLyObToDatum *arg, MemoryContext arg_mcxt,
Oid typeOid, int32 typmod,
struct PLyProcedure *proc);
-extern void PLy_input_setup_tuple(PLyDatumToOb *arg, TupleDesc desc,
+extern PGDLLEXPORT void PLy_input_setup_tuple(PLyDatumToOb *arg, TupleDesc desc,
struct PLyProcedure *proc);
-extern void PLy_output_setup_tuple(PLyObToDatum *arg, TupleDesc desc,
+extern PGDLLEXPORT void PLy_output_setup_tuple(PLyObToDatum *arg, TupleDesc desc,
struct PLyProcedure *proc);
-extern void PLy_output_setup_record(PLyObToDatum *arg, TupleDesc desc,
+extern PGDLLEXPORT void PLy_output_setup_record(PLyObToDatum *arg, TupleDesc desc,
struct PLyProcedure *proc);
/* conversion from Python objects to C strings --- exported for transforms */
-extern char *PLyObject_AsString(PyObject *plrv);
+extern PGDLLEXPORT char *PLyObject_AsString(PyObject *plrv);
#endif /* PLPY_TYPEIO_H */
diff --git a/src/pl/plpython/plpy_util.h b/src/pl/plpython/plpy_util.h
index c9ba7edc0ec..6927601e0be 100644
--- a/src/pl/plpython/plpy_util.h
+++ b/src/pl/plpython/plpy_util.h
@@ -8,12 +8,12 @@
#include "plpython.h"
-extern PyObject *PLyUnicode_Bytes(PyObject *unicode);
-extern char *PLyUnicode_AsString(PyObject *unicode);
+extern PGDLLEXPORT PyObject *PLyUnicode_Bytes(PyObject *unicode);
+extern PGDLLEXPORT char *PLyUnicode_AsString(PyObject *unicode);
#if PY_MAJOR_VERSION >= 3
-extern PyObject *PLyUnicode_FromString(const char *s);
-extern PyObject *PLyUnicode_FromStringAndSize(const char *s, Py_ssize_t size);
+extern PGDLLEXPORT PyObject *PLyUnicode_FromString(const char *s);
+extern PGDLLEXPORT PyObject *PLyUnicode_FromStringAndSize(const char *s, Py_ssize_t size);
#endif
#endif /* PLPY_UTIL_H */
diff --git a/src/test/modules/test_shm_mq/test_shm_mq.h b/src/test/modules/test_shm_mq/test_shm_mq.h
index a6661218347..a7a36714a48 100644
--- a/src/test/modules/test_shm_mq/test_shm_mq.h
+++ b/src/test/modules/test_shm_mq/test_shm_mq.h
@@ -40,6 +40,6 @@ extern void test_shm_mq_setup(int64 queue_size, int32 nworkers,
shm_mq_handle **input);
/* Main entrypoint for a worker. */
-extern void test_shm_mq_main(Datum) pg_attribute_noreturn();
+extern PGDLLEXPORT void test_shm_mq_main(Datum) pg_attribute_noreturn();
#endif
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index 0b6246676b6..e267bc3cffa 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -47,7 +47,7 @@ PG_MODULE_MAGIC;
PG_FUNCTION_INFO_V1(worker_spi_launch);
void _PG_init(void);
-void worker_spi_main(Datum) pg_attribute_noreturn();
+PGDLLEXPORT void worker_spi_main(Datum) pg_attribute_noreturn();
/* GUC variables */
static int worker_spi_naptime = 10;
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index aba59a270b4..811d6fcc5b2 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -432,6 +432,7 @@ sub GenerateFiles
HAVE_WINLDAP_H => undef,
HAVE_WCSTOMBS_L => 1,
HAVE_WCTYPE_H => 1,
+ HAVE_VISIBILITY_ATTRIBUTE => undef,
HAVE_WRITEV => undef,
HAVE_X509_GET_SIGNATURE_NID => 1,
HAVE_X86_64_POPCNTQ => undef,
--
2.23.0.385.gbc12974a89
v3-0011-meson-prereq-Handle-DLSUFFIX-in-msvc-builds-simil.patch (text/x-diff, 2.0K) download
From 9f1027a30568d7142ed3a57129b8c84494a8eb1f Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Thu, 30 Sep 2021 10:20:24 -0700
Subject: [PATCH v3 11/17] meson: prereq: Handle DLSUFFIX in msvc builds
similar to other build envs.
---
src/include/port/win32_port.h | 3 ---
src/tools/msvc/Mkvcbuild.pm | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index c1c4831595a..72b2d2b5a01 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -529,9 +529,6 @@ typedef unsigned short mode_t;
#define W_OK 2
#define R_OK 4
-/* Pulled from Makefile.port in MinGW */
-#define DLSUFFIX ".dll"
-
#endif /* _MSC_VER */
#if (defined(_MSC_VER) && (_MSC_VER < 1900)) || \
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index b8e62c6d3f7..47b5c43357a 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -195,6 +195,7 @@ sub mkvcbuild
'syncrep_gram.y');
$postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l',
'jsonpath_gram.y');
+ $postgres->AddDefine('DLSUFFIX=".dll"');
$postgres->AddDefine('BUILDING_DLL');
$postgres->AddLibrary('secur32.lib');
$postgres->AddLibrary('ws2_32.lib');
@@ -298,6 +299,7 @@ sub mkvcbuild
my $libecpg = $solution->AddProject('libecpg', 'dll', 'interfaces',
'src/interfaces/ecpg/ecpglib');
$libecpg->AddDefine('FRONTEND');
+ $libecpg->AddDefine('DLSUFFIX=".dll"');
$libecpg->AddIncludeDir('src/interfaces/ecpg/include');
$libecpg->AddIncludeDir('src/interfaces/libpq');
$libecpg->AddIncludeDir('src/port');
@@ -845,6 +847,7 @@ sub mkvcbuild
$pgregress->AddFile('src/test/regress/pg_regress.c');
$pgregress->AddFile('src/test/regress/pg_regress_main.c');
$pgregress->AddIncludeDir('src/port');
+ $pgregress->AddDefine('DLSUFFIX=".dll"');
$pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress->AddLibrary('ws2_32.lib');
$pgregress->AddDirResourceFile('src/test/regress');
--
2.23.0.385.gbc12974a89
v3-0012-prereq-Move-sed-expression-from-regress-python3-m.patch (text/x-diff, 2.9K) download
From 69e6ddf1d840d0d39005d559774626982c974bd1 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Sun, 3 Oct 2021 10:56:21 -0700
Subject: [PATCH v3 12/17] prereq: Move sed expression from
regress-python3-mangle.mk into its own file.
---
src/pl/plpython/regress-python3-mangle.mk | 17 ++---------------
src/pl/plpython/regress-python3-mangle.sed | 13 +++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
create mode 100644 src/pl/plpython/regress-python3-mangle.sed
diff --git a/src/pl/plpython/regress-python3-mangle.mk b/src/pl/plpython/regress-python3-mangle.mk
index a785818a172..a5c155e73de 100644
--- a/src/pl/plpython/regress-python3-mangle.mk
+++ b/src/pl/plpython/regress-python3-mangle.mk
@@ -14,21 +14,8 @@ REGRESS := $(foreach test,$(REGRESS),$(if $(filter $(test),$(REGRESS_PLPYTHON3_M
pgregress-python3-mangle:
$(MKDIR_P) sql/python3 expected/python3 results/python3
for file in $(patsubst %,$(srcdir)/sql/%.sql,$(REGRESS_PLPYTHON3_MANGLE)) $(patsubst %,$(srcdir)/expected/%*.out,$(REGRESS_PLPYTHON3_MANGLE)); do \
- sed \
- -e "s/<type 'exceptions\.\([[:alpha:]]*\)'>/<class '\1'>/g" \
- -e "s/<type 'long'>/<class 'int'>/g" \
- -e "s/\([0-9][0-9]*\)L/\1/g" \
- -e 's/\([ [{]\)u"/\1"/g' \
- -e "s/\([ [{]\)u'/\1'/g" \
- -e "s/def next/def __next__/g" \
- -e "s/LANGUAGE plpythonu/LANGUAGE plpython3u/g" \
- -e "s/LANGUAGE plpython2u/LANGUAGE plpython3u/g" \
- -e "s/EXTENSION plpythonu/EXTENSION plpython3u/g" \
- -e "s/EXTENSION plpython2u/EXTENSION plpython3u/g" \
- -e "s/EXTENSION \([^ ]*\)_plpythonu/EXTENSION \1_plpython3u/g" \
- -e "s/EXTENSION \([^ ]*\)_plpython2u/EXTENSION \1_plpython3u/g" \
- -e 's/installing required extension "plpython2u"/installing required extension "plpython3u"/g' \
- $$file >`echo $$file | sed 's,^.*/\([^/][^/]*/\)\([^/][^/]*\)$$,\1python3/\2,'` || exit; \
+ sed -f $(top_srcdir)/src/pl/plpython/regress-python3-mangle.sed $$file > \
+ `echo $$file | sed 's,^.*/\([^/][^/]*/\)\([^/][^/]*\)$$,\1python3/\2,'` || exit; \
done
check installcheck: pgregress-python3-mangle
diff --git a/src/pl/plpython/regress-python3-mangle.sed b/src/pl/plpython/regress-python3-mangle.sed
new file mode 100644
index 00000000000..d2fde24e0bf
--- /dev/null
+++ b/src/pl/plpython/regress-python3-mangle.sed
@@ -0,0 +1,13 @@
+s/<type 'exceptions\.\([[:alpha:]]*\)'>/<class '\1'>/g
+s/<type 'long'>/<class 'int'>/g
+s/\([0-9][0-9]*\)L/\1/g
+s/\([ [{]\)u"/\1"/g
+s/\([ [{]\)u'/\1'/g
+s/def next/def __next__/g
+s/LANGUAGE plpythonu/LANGUAGE plpython3u/g
+s/LANGUAGE plpython2u/LANGUAGE plpython3u/g
+s/EXTENSION plpythonu/EXTENSION plpython3u/g
+s/EXTENSION plpython2u/EXTENSION plpython3u/g
+s/EXTENSION \([^ ]*\)_plpythonu/EXTENSION \1_plpython3u/g
+s/EXTENSION \([^ ]*\)_plpython2u/EXTENSION \1_plpython3u/g
+s/installing required extension "plpython2u"/installing required extension "plpython3u"/g
--
2.23.0.385.gbc12974a89
v3-0013-Adapt-src-test-ldap-t-001_auth.pl-to-work-with-op.patch (text/x-diff, 1.1K) download
From 79eaef1e6a8039119d9e7a13671c8f94fecee2c3 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Sat, 9 Oct 2021 16:42:22 -0700
Subject: [PATCH v3 13/17] Adapt src/test/ldap/t/001_auth.pl to work with
openldap 2.5.
ldapsearch's deprecated -h/-p arguments were removed, need to use -H now.
Discussion: https://postgr.es/m/20211009233850.wvr6apcrw2ai6cnj@alap3.anarazel.de
Backpatch: 11-, where the tests were added.
---
src/test/ldap/t/001_auth.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index f670bc5e0d5..a025a641b02 100644
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -130,8 +130,8 @@ while (1)
last
if (
system_log(
- "ldapsearch", "-h", $ldap_server, "-p",
- $ldap_port, "-s", "base", "-b",
+ "ldapsearch", "-H", "$ldap_url", "-s",
+ "base", "-b",
$ldap_basedn, "-D", $ldap_rootdn, "-y",
$ldap_pwfile, "-n", "'objectclass=*'") == 0);
die "cannot connect to slapd" if ++$retries >= 300;
--
2.23.0.385.gbc12974a89
v3-0014-wip-don-t-run-ldap-tests-on-windows.patch (text/x-diff, 712B) download
From fddca5d028897e5a5f1d5affe3c426e9721a2655 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Sun, 10 Oct 2021 13:49:12 -0700
Subject: [PATCH v3 14/17] wip: don't run ldap tests on windows.
---
src/test/ldap/t/001_auth.pl | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index a025a641b02..c921a3d4872 100644
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -6,6 +6,13 @@ use warnings;
use TestLib;
use PostgresNode;
use Test::More;
+use Config;
+
+if ($Config{osname} eq 'MSWin32')
+{
+ plan skip_all => 'ldap tests ';
+ exit;
+}
if ($ENV{with_ldap} eq 'yes')
{
--
2.23.0.385.gbc12974a89
v3-0015-wip-split-TESTDIR-into-two.patch (text/x-diff, 5.3K) download
From 7eed3612b84eba13730c13eaf59cb0d7bdae9d81 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Fri, 1 Oct 2021 16:37:52 -0700
Subject: [PATCH v3 15/17] wip: split TESTDIR into two.
---
src/Makefile.global.in | 3 +++
src/bin/psql/t/010_tab_completion.pl | 34 ++++++++++++++--------------
src/test/perl/TestLib.pm | 2 +-
src/tools/msvc/vcregress.pl | 1 +
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a4ab27ae145..7505e3fa79d 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -450,6 +450,7 @@ define prove_installcheck
rm -rf '$(CURDIR)'/tmp_check
$(MKDIR_P) '$(CURDIR)'/tmp_check
cd $(srcdir) && \
+ TESTOUTDIR='$(CURDIR)/tmp_check' \
TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \
top_builddir='$(CURDIR)/$(top_builddir)' \
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
@@ -460,6 +461,7 @@ define prove_installcheck
rm -rf '$(CURDIR)'/tmp_check
$(MKDIR_P) '$(CURDIR)'/tmp_check
cd $(srcdir) && \
+ TESTOUTDIR='$(CURDIR)/tmp_check' \
TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \
top_builddir='$(top_builddir)' \
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
@@ -471,6 +473,7 @@ define prove_check
rm -rf '$(CURDIR)'/tmp_check
$(MKDIR_P) '$(CURDIR)'/tmp_check
cd $(srcdir) && \
+ TESTOUTDIR='$(CURDIR)/tmp_check' \
TESTDIR='$(CURDIR)' $(with_temp_install) PGPORT='6$(DEF_PGPORT)' \
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl
index 8695d225451..9123ac4c1f0 100644
--- a/src/bin/psql/t/010_tab_completion.pl
+++ b/src/bin/psql/t/010_tab_completion.pl
@@ -67,23 +67,23 @@ delete $ENV{LS_COLORS};
# to run in the build directory so that we can use relative paths to
# access the tmp_check subdirectory; otherwise the output from filename
# completion tests is too variable.
-if ($ENV{TESTDIR})
+if ($ENV{TESTOUTDIR})
{
- chdir $ENV{TESTDIR} or die "could not chdir to \"$ENV{TESTDIR}\": $!";
+ chdir "$ENV{TESTOUTDIR}" or die "could not chdir to \"$ENV{TESTOUTDIR}\": $!";
}
# Create some junk files for filename completion testing.
my $FH;
-open $FH, ">", "tmp_check/somefile"
- or die("could not create file \"tmp_check/somefile\": $!");
+open $FH, ">", "somefile"
+ or die("could not create file \"somefile\": $!");
print $FH "some stuff\n";
close $FH;
-open $FH, ">", "tmp_check/afile123"
- or die("could not create file \"tmp_check/afile123\": $!");
+open $FH, ">", "afile123"
+ or die("could not create file \"afile123\": $!");
print $FH "more stuff\n";
close $FH;
-open $FH, ">", "tmp_check/afile456"
- or die("could not create file \"tmp_check/afile456\": $!");
+open $FH, ">", "afile456"
+ or die("could not create file \"afile456\": $!");
print $FH "other stuff\n";
close $FH;
@@ -180,16 +180,16 @@ clear_query();
# check filename completion
check_completion(
- "\\lo_import tmp_check/some\t",
- qr|tmp_check/somefile |,
+ "\\lo_import some\t",
+ qr|somefile |,
"filename completion with one possibility");
clear_query();
# note: readline might print a bell before the completion
check_completion(
- "\\lo_import tmp_check/af\t",
- qr|tmp_check/af\a?ile|,
+ "\\lo_import af\t",
+ qr|af\a?ile|,
"filename completion with multiple possibilities");
clear_query();
@@ -198,15 +198,15 @@ clear_query();
# note: broken versions of libedit want to backslash the closing quote;
# not much we can do about that
check_completion(
- "COPY foo FROM tmp_check/some\t",
- qr|'tmp_check/somefile\\?' |,
+ "COPY foo FROM some\t",
+ qr|'somefile\\?' |,
"quoted filename completion with one possibility");
clear_line();
check_completion(
- "COPY foo FROM tmp_check/af\t",
- qr|'tmp_check/afile|,
+ "COPY foo FROM af\t",
+ qr|'afile|,
"quoted filename completion with multiple possibilities");
# some versions of readline/libedit require two tabs here, some only need one
@@ -214,7 +214,7 @@ check_completion(
# the quotes might appear, too
check_completion(
"\t\t",
- qr|afile123'? +'?(tmp_check/)?afile456|,
+ qr|afile123'? +'?afile456|,
"offer multiple file choices");
clear_line();
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 06aae1760eb..b3ae976d85c 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -187,7 +187,7 @@ INIT
# Determine output directories, and create them. The base path is the
# TESTDIR environment variable, which is normally set by the invoking
# Makefile.
- $tmp_check = $ENV{TESTDIR} ? "$ENV{TESTDIR}/tmp_check" : "tmp_check";
+ $tmp_check = $ENV{TESTOUTDIR} ? "$ENV{TESTOUTDIR}" : "tmp_check";
$log_path = "$tmp_check/log";
mkdir $tmp_check;
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 35e8f67f013..d2f5ef1118a 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -248,6 +248,7 @@ sub tap_check
$ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll";
$ENV{TESTDIR} = "$dir";
+ $ENV{TESTOUTDIR} = "$dir/tmp_check";
rmtree('tmp_check');
system(@args);
--
2.23.0.385.gbc12974a89
v3-0016-meson-Add-draft-of-a-meson-based-buildsystem.patch (text/x-diff, 240.5K) download
From b41aabee7aa54ec2f8e0c1fd770c0ee52b09ca12 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Fri, 10 Sep 2021 09:51:51 -0700
Subject: [PATCH v3 16/17] meson: Add draft of a meson based buildsystem.
Author: Andres Freund
Author: Thomas Munro
---
contrib/adminpack/meson.build | 20 +
contrib/amcheck/meson.build | 35 +
contrib/auth_delay/meson.build | 4 +
contrib/auto_explain/meson.build | 13 +
contrib/bloom/meson.build | 38 +
contrib/bool_plperl/meson.build | 37 +
contrib/btree_gin/meson.build | 51 +
contrib/btree_gist/meson.build | 79 +
contrib/citext/meson.build | 29 +
contrib/cube/meson.build | 42 +
contrib/dblink/meson.build | 29 +
contrib/dict_int/meson.build | 19 +
contrib/dict_xsyn/meson.build | 26 +
contrib/earthdistance/meson.build | 20 +
contrib/file_fdw/meson.build | 19 +
contrib/fuzzystrmatch/meson.build | 23 +
contrib/hstore/meson.build | 36 +
contrib/hstore_plperl/meson.build | 38 +
contrib/hstore_plpython/expected/meson.build | 15 +
contrib/hstore_plpython/meson.build | 44 +
contrib/hstore_plpython/sql/meson.build | 17 +
contrib/jsonb_plperl/meson.build | 37 +
contrib/jsonb_plpython/expected/meson.build | 15 +
contrib/jsonb_plpython/meson.build | 44 +
contrib/jsonb_plpython/sql/meson.build | 17 +
contrib/meson.build | 63 +
contrib/oid2name/meson.build | 14 +
contrib/pageinspect/meson.build | 45 +
contrib/pg_prewarm/meson.build | 16 +
contrib/pg_stat_statements/meson.build | 31 +
contrib/pg_trgm/meson.build | 33 +
contrib/pg_visibility/meson.build | 25 +
contrib/postgres_fdw/meson.build | 31 +
contrib/spi/meson.build | 43 +
contrib/test_decoding/meson.build | 69 +
contrib/tsm_system_rows/meson.build | 22 +
contrib/tsm_system_time/meson.build | 22 +
contrib/unaccent/meson.build | 30 +
contrib/vacuumlo/meson.build | 14 +
contrib/xml2/meson.build | 30 +
conversion_helpers.txt | 6 +
meson.build | 1901 +++++++++++++++++
meson_options.txt | 81 +
src/backend/access/brin/meson.build | 12 +
src/backend/access/common/meson.build | 18 +
src/backend/access/gin/meson.build | 17 +
src/backend/access/gist/meson.build | 13 +
src/backend/access/hash/meson.build | 12 +
src/backend/access/heap/meson.build | 11 +
src/backend/access/index/meson.build | 6 +
src/backend/access/meson.build | 13 +
src/backend/access/nbtree/meson.build | 13 +
src/backend/access/rmgrdesc/meson.build | 26 +
src/backend/access/spgist/meson.build | 13 +
src/backend/access/table/meson.build | 6 +
src/backend/access/tablesample/meson.build | 5 +
src/backend/access/transam/meson.build | 28 +
src/backend/bootstrap/meson.build | 12 +
src/backend/catalog/meson.build | 41 +
src/backend/commands/meson.build | 50 +
src/backend/executor/meson.build | 67 +
src/backend/foreign/meson.build | 3 +
src/backend/jit/llvm/meson.build | 41 +
src/backend/jit/meson.build | 3 +
src/backend/lib/meson.build | 12 +
src/backend/libpq/meson.build | 28 +
src/backend/main/meson.build | 2 +
src/backend/meson.build | 191 ++
src/backend/nodes/meson.build | 17 +
src/backend/optimizer/geqo/meson.build | 17 +
src/backend/optimizer/meson.build | 5 +
src/backend/optimizer/path/meson.build | 11 +
src/backend/optimizer/plan/meson.build | 10 +
src/backend/optimizer/prep/meson.build | 7 +
src/backend/optimizer/util/meson.build | 16 +
src/backend/parser/meson.build | 43 +
src/backend/partitioning/meson.build | 5 +
src/backend/port/meson.build | 28 +
src/backend/port/win32/meson.build | 6 +
src/backend/postmaster/meson.build | 15 +
src/backend/regex/meson.build | 15 +
.../replication/libpqwalreceiver/meson.build | 13 +
src/backend/replication/logical/meson.build | 14 +
src/backend/replication/meson.build | 42 +
src/backend/replication/pgoutput/meson.build | 11 +
src/backend/rewrite/meson.build | 9 +
src/backend/snowball/meson.build | 83 +
src/backend/statistics/meson.build | 6 +
src/backend/storage/buffer/meson.build | 7 +
src/backend/storage/file/meson.build | 8 +
src/backend/storage/freespace/meson.build | 5 +
src/backend/storage/ipc/meson.build | 20 +
src/backend/storage/large_object/meson.build | 3 +
src/backend/storage/lmgr/meson.build | 18 +
src/backend/storage/meson.build | 9 +
src/backend/storage/page/meson.build | 5 +
src/backend/storage/smgr/meson.build | 4 +
src/backend/storage/sync/meson.build | 4 +
src/backend/tcop/meson.build | 8 +
src/backend/tsearch/meson.build | 21 +
src/backend/utils/activity/meson.build | 5 +
src/backend/utils/adt/meson.build | 118 +
src/backend/utils/cache/meson.build | 16 +
src/backend/utils/error/meson.build | 4 +
src/backend/utils/fmgr/meson.build | 8 +
src/backend/utils/hash/meson.build | 4 +
src/backend/utils/init/meson.build | 4 +
.../utils/mb/conversion_procs/meson.build | 38 +
src/backend/utils/mb/meson.build | 9 +
src/backend/utils/meson.build | 13 +
src/backend/utils/misc/meson.build | 28 +
src/backend/utils/mmgr/meson.build | 10 +
src/backend/utils/mmgr/proxy.c | 217 ++
src/backend/utils/resowner/meson.build | 3 +
src/backend/utils/sort/meson.build | 7 +
src/backend/utils/time/meson.build | 4 +
src/bin/initdb/meson.build | 24 +
src/bin/meson.build | 20 +
src/bin/pg_amcheck/meson.build | 22 +
src/bin/pg_archivecleanup/meson.build | 14 +
src/bin/pg_basebackup/meson.build | 44 +
src/bin/pg_checksums/meson.build | 16 +
src/bin/pg_config/meson.build | 14 +
src/bin/pg_controldata/meson.build | 14 +
src/bin/pg_ctl/meson.build | 17 +
src/bin/pg_dump/meson.build | 69 +
src/bin/pg_resetwal/meson.build | 15 +
src/bin/pg_rewind/meson.build | 34 +
src/bin/pg_test_fsync/meson.build | 14 +
src/bin/pg_test_timing/meson.build | 14 +
src/bin/pg_upgrade/meson.build | 26 +
src/bin/pg_verifybackup/meson.build | 25 +
src/bin/pg_waldump/meson.build | 23 +
src/bin/pgbench/meson.build | 38 +
src/bin/pgevent/meson.build | 1 +
src/bin/psql/meson.build | 46 +
src/bin/scripts/meson.build | 46 +
src/common/meson.build | 140 ++
src/fe_utils/meson.build | 27 +
src/include/catalog/meson.build | 113 +
src/include/meson.build | 50 +
src/include/parser/meson.build | 10 +
src/include/pch/c_pch.h | 1 +
src/include/pch/postgres_pch.h | 1 +
src/include/pg_config_ext.h.meson | 7 +
src/include/storage/meson.build | 15 +
src/include/utils/meson.build | 22 +
src/interfaces/libpq/meson.build | 99 +
src/meson.build | 10 +
src/pl/meson.build | 4 +
src/pl/plperl/meson.build | 81 +
src/pl/plpgsql/meson.build | 1 +
src/pl/plpgsql/src/meson.build | 67 +
src/pl/plpython/expected/meson.build | 14 +
src/pl/plpython/meson.build | 100 +
src/pl/plpython/sql/meson.build | 15 +
src/port/meson.build | 146 ++
src/test/authentication/meson.build | 9 +
src/test/isolation/meson.build | 49 +
src/test/kerberos/meson.build | 12 +
src/test/ldap/meson.build | 9 +
src/test/meson.build | 19 +
src/test/modules/brin/meson.build | 19 +
src/test/modules/commit_ts/meson.build | 20 +
src/test/modules/delay_execution/meson.build | 15 +
src/test/modules/dummy_index_am/meson.build | 20 +
src/test/modules/dummy_seclabel/meson.build | 20 +
src/test/modules/libpq_pipeline/meson.build | 21 +
src/test/modules/meson.build | 25 +
src/test/modules/plsample/meson.build | 20 +
src/test/modules/snapshot_too_old/meson.build | 11 +
src/test/modules/spgist_name_ops/meson.build | 20 +
.../ssl_passphrase_callback/meson.build | 45 +
src/test/modules/test_bloomfilter/meson.build | 20 +
src/test/modules/test_ddl_deparse/meson.build | 40 +
src/test/modules/test_extensions/meson.build | 38 +
.../modules/test_ginpostinglist/meson.build | 20 +
src/test/modules/test_integerset/meson.build | 20 +
src/test/modules/test_misc/meson.build | 8 +
src/test/modules/test_parser/meson.build | 20 +
src/test/modules/test_pg_dump/meson.build | 24 +
src/test/modules/test_predtest/meson.build | 20 +
src/test/modules/test_rbtree/meson.build | 20 +
src/test/modules/test_regex/meson.build | 21 +
src/test/modules/test_rls_hooks/meson.build | 19 +
src/test/modules/test_shm_mq/meson.build | 24 +
src/test/modules/unsafe_tests/meson.build | 9 +
src/test/modules/worker_spi/meson.build | 23 +
src/test/recovery/meson.build | 33 +
src/test/regress/meson.build | 57 +
src/test/ssl/meson.build | 10 +
src/test/subscription/meson.build | 33 +
src/timezone/meson.build | 50 +
src/timezone/tznames/meson.build | 20 +
src/tools/find_meson | 20 +
src/tools/irlink | 28 +
src/tools/msvc/export2def.pl | 22 +
src/tools/msvc/gendef2.pl | 177 ++
src/tools/testwrap | 22 +
199 files changed, 7430 insertions(+)
create mode 100644 contrib/adminpack/meson.build
create mode 100644 contrib/amcheck/meson.build
create mode 100644 contrib/auth_delay/meson.build
create mode 100644 contrib/auto_explain/meson.build
create mode 100644 contrib/bloom/meson.build
create mode 100644 contrib/bool_plperl/meson.build
create mode 100644 contrib/btree_gin/meson.build
create mode 100644 contrib/btree_gist/meson.build
create mode 100644 contrib/citext/meson.build
create mode 100644 contrib/cube/meson.build
create mode 100644 contrib/dblink/meson.build
create mode 100644 contrib/dict_int/meson.build
create mode 100644 contrib/dict_xsyn/meson.build
create mode 100644 contrib/earthdistance/meson.build
create mode 100644 contrib/file_fdw/meson.build
create mode 100644 contrib/fuzzystrmatch/meson.build
create mode 100644 contrib/hstore/meson.build
create mode 100644 contrib/hstore_plperl/meson.build
create mode 100644 contrib/hstore_plpython/expected/meson.build
create mode 100644 contrib/hstore_plpython/meson.build
create mode 100644 contrib/hstore_plpython/sql/meson.build
create mode 100644 contrib/jsonb_plperl/meson.build
create mode 100644 contrib/jsonb_plpython/expected/meson.build
create mode 100644 contrib/jsonb_plpython/meson.build
create mode 100644 contrib/jsonb_plpython/sql/meson.build
create mode 100644 contrib/meson.build
create mode 100644 contrib/oid2name/meson.build
create mode 100644 contrib/pageinspect/meson.build
create mode 100644 contrib/pg_prewarm/meson.build
create mode 100644 contrib/pg_stat_statements/meson.build
create mode 100644 contrib/pg_trgm/meson.build
create mode 100644 contrib/pg_visibility/meson.build
create mode 100644 contrib/postgres_fdw/meson.build
create mode 100644 contrib/spi/meson.build
create mode 100644 contrib/test_decoding/meson.build
create mode 100644 contrib/tsm_system_rows/meson.build
create mode 100644 contrib/tsm_system_time/meson.build
create mode 100644 contrib/unaccent/meson.build
create mode 100644 contrib/vacuumlo/meson.build
create mode 100644 contrib/xml2/meson.build
create mode 100644 conversion_helpers.txt
create mode 100644 meson.build
create mode 100644 meson_options.txt
create mode 100644 src/backend/access/brin/meson.build
create mode 100644 src/backend/access/common/meson.build
create mode 100644 src/backend/access/gin/meson.build
create mode 100644 src/backend/access/gist/meson.build
create mode 100644 src/backend/access/hash/meson.build
create mode 100644 src/backend/access/heap/meson.build
create mode 100644 src/backend/access/index/meson.build
create mode 100644 src/backend/access/meson.build
create mode 100644 src/backend/access/nbtree/meson.build
create mode 100644 src/backend/access/rmgrdesc/meson.build
create mode 100644 src/backend/access/spgist/meson.build
create mode 100644 src/backend/access/table/meson.build
create mode 100644 src/backend/access/tablesample/meson.build
create mode 100644 src/backend/access/transam/meson.build
create mode 100644 src/backend/bootstrap/meson.build
create mode 100644 src/backend/catalog/meson.build
create mode 100644 src/backend/commands/meson.build
create mode 100644 src/backend/executor/meson.build
create mode 100644 src/backend/foreign/meson.build
create mode 100644 src/backend/jit/llvm/meson.build
create mode 100644 src/backend/jit/meson.build
create mode 100644 src/backend/lib/meson.build
create mode 100644 src/backend/libpq/meson.build
create mode 100644 src/backend/main/meson.build
create mode 100644 src/backend/meson.build
create mode 100644 src/backend/nodes/meson.build
create mode 100644 src/backend/optimizer/geqo/meson.build
create mode 100644 src/backend/optimizer/meson.build
create mode 100644 src/backend/optimizer/path/meson.build
create mode 100644 src/backend/optimizer/plan/meson.build
create mode 100644 src/backend/optimizer/prep/meson.build
create mode 100644 src/backend/optimizer/util/meson.build
create mode 100644 src/backend/parser/meson.build
create mode 100644 src/backend/partitioning/meson.build
create mode 100644 src/backend/port/meson.build
create mode 100644 src/backend/port/win32/meson.build
create mode 100644 src/backend/postmaster/meson.build
create mode 100644 src/backend/regex/meson.build
create mode 100644 src/backend/replication/libpqwalreceiver/meson.build
create mode 100644 src/backend/replication/logical/meson.build
create mode 100644 src/backend/replication/meson.build
create mode 100644 src/backend/replication/pgoutput/meson.build
create mode 100644 src/backend/rewrite/meson.build
create mode 100644 src/backend/snowball/meson.build
create mode 100644 src/backend/statistics/meson.build
create mode 100644 src/backend/storage/buffer/meson.build
create mode 100644 src/backend/storage/file/meson.build
create mode 100644 src/backend/storage/freespace/meson.build
create mode 100644 src/backend/storage/ipc/meson.build
create mode 100644 src/backend/storage/large_object/meson.build
create mode 100644 src/backend/storage/lmgr/meson.build
create mode 100644 src/backend/storage/meson.build
create mode 100644 src/backend/storage/page/meson.build
create mode 100644 src/backend/storage/smgr/meson.build
create mode 100644 src/backend/storage/sync/meson.build
create mode 100644 src/backend/tcop/meson.build
create mode 100644 src/backend/tsearch/meson.build
create mode 100644 src/backend/utils/activity/meson.build
create mode 100644 src/backend/utils/adt/meson.build
create mode 100644 src/backend/utils/cache/meson.build
create mode 100644 src/backend/utils/error/meson.build
create mode 100644 src/backend/utils/fmgr/meson.build
create mode 100644 src/backend/utils/hash/meson.build
create mode 100644 src/backend/utils/init/meson.build
create mode 100644 src/backend/utils/mb/conversion_procs/meson.build
create mode 100644 src/backend/utils/mb/meson.build
create mode 100644 src/backend/utils/meson.build
create mode 100644 src/backend/utils/misc/meson.build
create mode 100644 src/backend/utils/mmgr/meson.build
create mode 100644 src/backend/utils/mmgr/proxy.c
create mode 100644 src/backend/utils/resowner/meson.build
create mode 100644 src/backend/utils/sort/meson.build
create mode 100644 src/backend/utils/time/meson.build
create mode 100644 src/bin/initdb/meson.build
create mode 100644 src/bin/meson.build
create mode 100644 src/bin/pg_amcheck/meson.build
create mode 100644 src/bin/pg_archivecleanup/meson.build
create mode 100644 src/bin/pg_basebackup/meson.build
create mode 100644 src/bin/pg_checksums/meson.build
create mode 100644 src/bin/pg_config/meson.build
create mode 100644 src/bin/pg_controldata/meson.build
create mode 100644 src/bin/pg_ctl/meson.build
create mode 100644 src/bin/pg_dump/meson.build
create mode 100644 src/bin/pg_resetwal/meson.build
create mode 100644 src/bin/pg_rewind/meson.build
create mode 100644 src/bin/pg_test_fsync/meson.build
create mode 100644 src/bin/pg_test_timing/meson.build
create mode 100644 src/bin/pg_upgrade/meson.build
create mode 100644 src/bin/pg_verifybackup/meson.build
create mode 100644 src/bin/pg_waldump/meson.build
create mode 100644 src/bin/pgbench/meson.build
create mode 100644 src/bin/pgevent/meson.build
create mode 100644 src/bin/psql/meson.build
create mode 100644 src/bin/scripts/meson.build
create mode 100644 src/common/meson.build
create mode 100644 src/fe_utils/meson.build
create mode 100644 src/include/catalog/meson.build
create mode 100644 src/include/meson.build
create mode 100644 src/include/parser/meson.build
create mode 100644 src/include/pch/c_pch.h
create mode 100644 src/include/pch/postgres_pch.h
create mode 100644 src/include/pg_config_ext.h.meson
create mode 100644 src/include/storage/meson.build
create mode 100644 src/include/utils/meson.build
create mode 100644 src/interfaces/libpq/meson.build
create mode 100644 src/meson.build
create mode 100644 src/pl/meson.build
create mode 100644 src/pl/plperl/meson.build
create mode 100644 src/pl/plpgsql/meson.build
create mode 100644 src/pl/plpgsql/src/meson.build
create mode 100644 src/pl/plpython/expected/meson.build
create mode 100644 src/pl/plpython/meson.build
create mode 100644 src/pl/plpython/sql/meson.build
create mode 100644 src/port/meson.build
create mode 100644 src/test/authentication/meson.build
create mode 100644 src/test/isolation/meson.build
create mode 100644 src/test/kerberos/meson.build
create mode 100644 src/test/ldap/meson.build
create mode 100644 src/test/meson.build
create mode 100644 src/test/modules/brin/meson.build
create mode 100644 src/test/modules/commit_ts/meson.build
create mode 100644 src/test/modules/delay_execution/meson.build
create mode 100644 src/test/modules/dummy_index_am/meson.build
create mode 100644 src/test/modules/dummy_seclabel/meson.build
create mode 100644 src/test/modules/libpq_pipeline/meson.build
create mode 100644 src/test/modules/meson.build
create mode 100644 src/test/modules/plsample/meson.build
create mode 100644 src/test/modules/snapshot_too_old/meson.build
create mode 100644 src/test/modules/spgist_name_ops/meson.build
create mode 100644 src/test/modules/ssl_passphrase_callback/meson.build
create mode 100644 src/test/modules/test_bloomfilter/meson.build
create mode 100644 src/test/modules/test_ddl_deparse/meson.build
create mode 100644 src/test/modules/test_extensions/meson.build
create mode 100644 src/test/modules/test_ginpostinglist/meson.build
create mode 100644 src/test/modules/test_integerset/meson.build
create mode 100644 src/test/modules/test_misc/meson.build
create mode 100644 src/test/modules/test_parser/meson.build
create mode 100644 src/test/modules/test_pg_dump/meson.build
create mode 100644 src/test/modules/test_predtest/meson.build
create mode 100644 src/test/modules/test_rbtree/meson.build
create mode 100644 src/test/modules/test_regex/meson.build
create mode 100644 src/test/modules/test_rls_hooks/meson.build
create mode 100644 src/test/modules/test_shm_mq/meson.build
create mode 100644 src/test/modules/unsafe_tests/meson.build
create mode 100644 src/test/modules/worker_spi/meson.build
create mode 100644 src/test/recovery/meson.build
create mode 100644 src/test/regress/meson.build
create mode 100644 src/test/ssl/meson.build
create mode 100644 src/test/subscription/meson.build
create mode 100644 src/timezone/meson.build
create mode 100644 src/timezone/tznames/meson.build
create mode 100755 src/tools/find_meson
create mode 100644 src/tools/irlink
create mode 100644 src/tools/msvc/export2def.pl
create mode 100644 src/tools/msvc/gendef2.pl
create mode 100755 src/tools/testwrap
diff --git a/contrib/adminpack/meson.build b/contrib/adminpack/meson.build
new file mode 100644
index 00000000000..457a6089445
--- /dev/null
+++ b/contrib/adminpack/meson.build
@@ -0,0 +1,20 @@
+autoinc = shared_module('adminpack',
+ ['adminpack.c'],
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'adminpack.control',
+ 'adminpack--1.0.sql',
+ 'adminpack--1.0--1.1.sql',
+ 'adminpack--1.1--2.0.sql',
+ 'adminpack--2.0--2.1.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'adminpack',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': ['adminpack'],
+}
diff --git a/contrib/amcheck/meson.build b/contrib/amcheck/meson.build
new file mode 100644
index 00000000000..7d6a7bc8385
--- /dev/null
+++ b/contrib/amcheck/meson.build
@@ -0,0 +1,35 @@
+amcheck = shared_module('amcheck', [
+ 'verify_heapam.c',
+ 'verify_nbtree.c',
+ ],
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'amcheck.control',
+ 'amcheck--1.0.sql',
+ 'amcheck--1.0--1.1.sql',
+ 'amcheck--1.1--1.2.sql',
+ 'amcheck--1.2--1.3.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'amcheck',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'check',
+ 'check_btree',
+ 'check_heap'
+ ],
+}
+
+tap_tests += {
+ 'name': 'amcheck',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_verify_heapam.pl',
+ ],
+}
diff --git a/contrib/auth_delay/meson.build b/contrib/auth_delay/meson.build
new file mode 100644
index 00000000000..941bb6f39a4
--- /dev/null
+++ b/contrib/auth_delay/meson.build
@@ -0,0 +1,4 @@
+autoinc = shared_module('auth_delay',
+ ['auth_delay.c'],
+ kwargs: contrib_mod_args,
+)
diff --git a/contrib/auto_explain/meson.build b/contrib/auto_explain/meson.build
new file mode 100644
index 00000000000..321896efa2c
--- /dev/null
+++ b/contrib/auto_explain/meson.build
@@ -0,0 +1,13 @@
+auto_explain = shared_module('auto_explain',
+ files('auto_explain.c'),
+ kwargs: contrib_mod_args,
+)
+
+tap_tests += {
+ 'name': 'auto_explain',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_auto_explain.pl',
+ ]
+}
diff --git a/contrib/bloom/meson.build b/contrib/bloom/meson.build
new file mode 100644
index 00000000000..5c5d33c7f7a
--- /dev/null
+++ b/contrib/bloom/meson.build
@@ -0,0 +1,38 @@
+bloom_sources = files(
+ 'blcost.c',
+ 'blinsert.c',
+ 'blscan.c',
+ 'blutils.c',
+ 'blvacuum.c',
+ 'blvalidate.c',
+)
+
+bloom = shared_module('bloom',
+ bloom_sources,
+ c_pch: '../../src/include/pch/c_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'bloom.control',
+ 'bloom--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'bloom',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'bloom'
+ ],
+}
+
+tap_tests += {
+ 'name': 'bloom',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_wal.pl',
+ ],
+}
diff --git a/contrib/bool_plperl/meson.build b/contrib/bool_plperl/meson.build
new file mode 100644
index 00000000000..e15dc5285eb
--- /dev/null
+++ b/contrib/bool_plperl/meson.build
@@ -0,0 +1,37 @@
+if not perl_dep.found()
+ subdir_done()
+endif
+
+bool_plperl_sources = files(
+ 'bool_plperl.c',
+)
+
+bool_plperl = shared_module('bool_plperl',
+ bool_plperl_sources,
+ include_directories: [plperl_inc, include_directories('.')],
+ kwargs: pg_mod_args + {
+ 'dependencies': [perl_dep, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'bool_plperl.control',
+ 'bool_plperl--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+install_data(
+ 'bool_plperlu.control',
+ 'bool_plperlu--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'bool_plperl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'bool_plperl',
+ 'bool_plperlu',
+ ],
+}
diff --git a/contrib/btree_gin/meson.build b/contrib/btree_gin/meson.build
new file mode 100644
index 00000000000..d25ece7500e
--- /dev/null
+++ b/contrib/btree_gin/meson.build
@@ -0,0 +1,51 @@
+btree_gin = shared_module('btree_gin',
+ files('btree_gin.c'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'btree_gin.control',
+ 'btree_gin--1.0.sql',
+ 'btree_gin--1.0--1.1.sql',
+ 'btree_gin--1.1--1.2.sql',
+ 'btree_gin--1.2--1.3.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'btree_gin',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'install_btree_gin',
+ 'int2',
+ 'int4',
+ 'int8',
+ 'float4',
+ 'float8',
+ 'money',
+ 'oid',
+ 'timestamp',
+ 'timestamptz',
+ 'time',
+ 'timetz',
+ 'date',
+ 'interval',
+ 'macaddr',
+ 'macaddr8',
+ 'inet',
+ 'cidr',
+ 'text',
+ 'varchar',
+ 'char',
+ 'bytea',
+ 'bit',
+ 'varbit',
+ 'numeric',
+ 'enum',
+ 'uuid',
+ 'name',
+ 'bool',
+ 'bpchar',
+ ],
+}
diff --git a/contrib/btree_gist/meson.build b/contrib/btree_gist/meson.build
new file mode 100644
index 00000000000..8ee0faea401
--- /dev/null
+++ b/contrib/btree_gist/meson.build
@@ -0,0 +1,79 @@
+btree_gist_sources = files(
+ 'btree_bit.c',
+ 'btree_bytea.c',
+ 'btree_cash.c',
+ 'btree_date.c',
+ 'btree_enum.c',
+ 'btree_float4.c',
+ 'btree_float8.c',
+ 'btree_gist.c',
+ 'btree_inet.c',
+ 'btree_int2.c',
+ 'btree_int4.c',
+ 'btree_int8.c',
+ 'btree_interval.c',
+ 'btree_macaddr.c',
+ 'btree_macaddr8.c',
+ 'btree_numeric.c',
+ 'btree_oid.c',
+ 'btree_text.c',
+ 'btree_time.c',
+ 'btree_ts.c',
+ 'btree_utils_num.c',
+ 'btree_utils_var.c',
+ 'btree_uuid.c',
+)
+
+btree_gist = shared_module('btree_gist',
+ btree_gist_sources,
+ c_pch: '../../src/include/pch/c_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'btree_gist.control',
+ 'btree_gist--1.0--1.1.sql',
+ 'btree_gist--1.1--1.2.sql',
+ 'btree_gist--1.2.sql',
+ 'btree_gist--1.2--1.3.sql',
+ 'btree_gist--1.3--1.4.sql',
+ 'btree_gist--1.4--1.5.sql',
+ 'btree_gist--1.5--1.6.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'btree_gist',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'init',
+ 'int2',
+ 'int4',
+ 'int8',
+ 'float4',
+ 'float8',
+ 'cash',
+ 'oid',
+ 'timestamp',
+ 'timestamptz',
+ 'time',
+ 'timetz',
+ 'date',
+ 'interval',
+ 'macaddr',
+ 'macaddr8',
+ 'inet',
+ 'cidr',
+ 'text',
+ 'varchar',
+ 'char',
+ 'bytea',
+ 'bit',
+ 'varbit',
+ 'numeric',
+ 'uuid',
+ 'not_equal',
+ 'enum',
+ ],
+}
diff --git a/contrib/citext/meson.build b/contrib/citext/meson.build
new file mode 100644
index 00000000000..f2e9ff2117d
--- /dev/null
+++ b/contrib/citext/meson.build
@@ -0,0 +1,29 @@
+citext_sources = files(
+ 'citext.c',
+)
+
+citext = shared_module('citext',
+ citext_sources,
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'citext.control',
+ 'citext--1.0--1.1.sql',
+ 'citext--1.1--1.2.sql',
+ 'citext--1.2--1.3.sql',
+ 'citext--1.3--1.4.sql',
+ 'citext--1.4.sql',
+ 'citext--1.4--1.5.sql',
+ 'citext--1.5--1.6.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'citext',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'citext'
+ ],
+}
diff --git a/contrib/cube/meson.build b/contrib/cube/meson.build
new file mode 100644
index 00000000000..49276aed644
--- /dev/null
+++ b/contrib/cube/meson.build
@@ -0,0 +1,42 @@
+cube_sources = files(
+ 'cube.c',
+)
+
+# cubescan is compiled as part of cubeparse
+cubescan = custom_target('cubescan',
+ input: ['cubescan.l'],
+ output: ['cubescan.c'],
+ command: [flex, '-CFe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+
+cube_sources += custom_target('cubeparse',
+ input: 'cubeparse.y',
+ output: 'cubeparse.c',
+ depends: cubescan,
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
+
+cube = shared_module('cube',
+ cube_sources,
+ include_directories: include_directories('.'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'cube.control',
+ 'cube--1.0--1.1.sql',
+ 'cube--1.1--1.2.sql',
+ 'cube--1.2.sql',
+ 'cube--1.2--1.3.sql',
+ 'cube--1.3--1.4.sql',
+ 'cube--1.4--1.5.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'cube',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'cube',
+ 'cube_sci',
+ ],
+}
diff --git a/contrib/dblink/meson.build b/contrib/dblink/meson.build
new file mode 100644
index 00000000000..7ac253700c9
--- /dev/null
+++ b/contrib/dblink/meson.build
@@ -0,0 +1,29 @@
+dblink_sources = files(
+ 'dblink.c',
+)
+
+dblink = shared_module('dblink',
+ dblink_sources,
+ kwargs: contrib_mod_args + {
+ 'dependencies': pg_mod_args['dependencies'] + [libpq],
+ },
+)
+
+install_data(
+ 'dblink.control',
+ 'dblink--1.0--1.1.sql',
+ 'dblink--1.1--1.2.sql',
+ 'dblink--1.2.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'dblink',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'paths',
+ 'dblink'
+ ],
+ 'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
+}
diff --git a/contrib/dict_int/meson.build b/contrib/dict_int/meson.build
new file mode 100644
index 00000000000..7c23b275c5a
--- /dev/null
+++ b/contrib/dict_int/meson.build
@@ -0,0 +1,19 @@
+dict_int = shared_module('dict_int',
+ files('dict_int.c'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'dict_int.control',
+ 'dict_int--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'dict_int',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'dict_int'
+ ],
+}
diff --git a/contrib/dict_xsyn/meson.build b/contrib/dict_xsyn/meson.build
new file mode 100644
index 00000000000..7cbabba02f1
--- /dev/null
+++ b/contrib/dict_xsyn/meson.build
@@ -0,0 +1,26 @@
+dict_xsyn = shared_module('dict_xsyn',
+ files('dict_xsyn.c'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'dict_xsyn.control',
+ 'dict_xsyn--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+install_data(
+ 'xsyn_sample.rules',
+ kwargs: contrib_data_args + {
+ 'install_dir': get_option('datadir') / 'tsearch_data'
+ }
+)
+
+regress_tests += {
+ 'name': 'dict_xsyn',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'dict_xsyn'
+ ],
+}
diff --git a/contrib/earthdistance/meson.build b/contrib/earthdistance/meson.build
new file mode 100644
index 00000000000..d56abf4f260
--- /dev/null
+++ b/contrib/earthdistance/meson.build
@@ -0,0 +1,20 @@
+earthdistance = shared_module('earthdistance',
+ files('earthdistance.c'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'earthdistance.control',
+ 'earthdistance--1.0--1.1.sql',
+ 'earthdistance--1.1.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'earthdistance',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'earthdistance'
+ ],
+}
diff --git a/contrib/file_fdw/meson.build b/contrib/file_fdw/meson.build
new file mode 100644
index 00000000000..0cd3348dfd0
--- /dev/null
+++ b/contrib/file_fdw/meson.build
@@ -0,0 +1,19 @@
+file_fdw = shared_module('file_fdw',
+ files('file_fdw.c'),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'file_fdw.control',
+ 'file_fdw--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'file_fdw',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'file_fdw'
+ ],
+}
diff --git a/contrib/fuzzystrmatch/meson.build b/contrib/fuzzystrmatch/meson.build
new file mode 100644
index 00000000000..d1e75479668
--- /dev/null
+++ b/contrib/fuzzystrmatch/meson.build
@@ -0,0 +1,23 @@
+fuzzystrmatch = shared_module('fuzzystrmatch',
+ files(
+ 'fuzzystrmatch.c',
+ 'dmetaphone.c'
+ ),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'fuzzystrmatch.control',
+ 'fuzzystrmatch--1.0--1.1.sql',
+ 'fuzzystrmatch--1.1.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'fuzzystrmatch',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'fuzzystrmatch'
+ ],
+}
diff --git a/contrib/hstore/meson.build b/contrib/hstore/meson.build
new file mode 100644
index 00000000000..661e61f9692
--- /dev/null
+++ b/contrib/hstore/meson.build
@@ -0,0 +1,36 @@
+# .. so that includes of hstore/hstore.h work
+hstore_inc = include_directories('.', '../')
+
+hstore = shared_module('hstore',
+ files(
+ 'hstore_compat.c',
+ 'hstore_gin.c',
+ 'hstore_gist.c',
+ 'hstore_io.c',
+ 'hstore_op.c',
+ 'hstore_subs.c',
+ ),
+ c_pch: '../../src/include/pch/c_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'hstore.control',
+ 'hstore--1.1--1.2.sql',
+ 'hstore--1.3--1.4.sql',
+ 'hstore--1.4.sql',
+ 'hstore--1.4--1.5.sql',
+ 'hstore--1.5--1.6.sql',
+ 'hstore--1.6--1.7.sql',
+ 'hstore--1.7--1.8.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'hstore',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'hstore'
+ ],
+}
diff --git a/contrib/hstore_plperl/meson.build b/contrib/hstore_plperl/meson.build
new file mode 100644
index 00000000000..48231cb1c9e
--- /dev/null
+++ b/contrib/hstore_plperl/meson.build
@@ -0,0 +1,38 @@
+if not perl_dep.found()
+ subdir_done()
+endif
+
+hstore_plperl_sources = files(
+ 'hstore_plperl.c',
+)
+
+hstore_plperl = shared_module('hstore_plperl',
+ hstore_plperl_sources,
+ include_directories: [plperl_inc, hstore_inc],
+ kwargs: pg_mod_args + {
+ 'dependencies': [perl_dep, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'hstore_plperl.control',
+ 'hstore_plperl--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+install_data(
+ 'hstore_plperlu.control',
+ 'hstore_plperlu--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'hstore_plperl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'hstore_plperl',
+ 'hstore_plperlu',
+ 'create_transform',
+ ],
+}
diff --git a/contrib/hstore_plpython/expected/meson.build b/contrib/hstore_plpython/expected/meson.build
new file mode 100644
index 00000000000..5a33c3752ef
--- /dev/null
+++ b/contrib/hstore_plpython/expected/meson.build
@@ -0,0 +1,15 @@
+foreach r2 : hstore_plpython_regress
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+
+ s2 = '@0@.out'.format(r2)
+ s3 = '@0@.out'.format(r3)
+ hstore_plpython3_deps += custom_target(s3,
+ input: '@0@.out'.format(r2),
+ output: '@0@.out'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ build_by_default: false,
+ install: false,
+ )
+endforeach
diff --git a/contrib/hstore_plpython/meson.build b/contrib/hstore_plpython/meson.build
new file mode 100644
index 00000000000..3c47a71e430
--- /dev/null
+++ b/contrib/hstore_plpython/meson.build
@@ -0,0 +1,44 @@
+if not python3.found()
+ subdir_done()
+endif
+
+hstore_plpython_sources = files(
+ 'hstore_plpython.c',
+)
+
+hstore_plpython = shared_module('hstore_plpython3',
+ hstore_plpython_sources,
+ include_directories: [plpython_inc, hstore_inc, ],
+ kwargs: pg_mod_args + {
+ 'c_args': ['-DPLPYTHON_LIBNAME="plpython3"'] + contrib_mod_args['c_args'],
+ 'dependencies': [python3, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'hstore_plpythonu.control',
+ 'hstore_plpython2u.control',
+ 'hstore_plpython3u.control',
+ 'hstore_plpythonu--1.0.sql',
+ 'hstore_plpython2u--1.0.sql',
+ 'hstore_plpython3u--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+hstore_plpython_regress = ['hstore_plpython']
+
+hstore_plpython3_regress = []
+hstore_plpython3_deps = []
+
+# FIXME: this is an abysmal hack
+subdir('sql')
+subdir('expected')
+
+regress_tests += {
+ 'name': 'hstore_plpython',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': hstore_plpython3_regress,
+ 'deps': hstore_plpython3_deps,
+ 'regress_args': ['--inputdir', meson.current_build_dir(), '--load-extension=hstore'],
+}
diff --git a/contrib/hstore_plpython/sql/meson.build b/contrib/hstore_plpython/sql/meson.build
new file mode 100644
index 00000000000..612980fd37c
--- /dev/null
+++ b/contrib/hstore_plpython/sql/meson.build
@@ -0,0 +1,17 @@
+# Convert plpython2 regression tests to plpython3 ones
+foreach r2 : hstore_plpython_regress
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+ hstore_plpython3_regress += r3
+
+ s2 = '@0@.sql'.format(r2)
+ s3 = '@0@.sql'.format(r3)
+ hstore_plpython3_deps += custom_target(s3,
+ input: '@0@.sql'.format(r2),
+ output: '@0@.sql'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ build_by_default: false,
+ install: false,
+ )
+endforeach
diff --git a/contrib/jsonb_plperl/meson.build b/contrib/jsonb_plperl/meson.build
new file mode 100644
index 00000000000..c34090e5f5c
--- /dev/null
+++ b/contrib/jsonb_plperl/meson.build
@@ -0,0 +1,37 @@
+if not perl_dep.found()
+ subdir_done()
+endif
+
+jsonb_plperl_sources = files(
+ 'jsonb_plperl.c',
+)
+
+jsonb_plperl = shared_module('jsonb_plperl',
+ jsonb_plperl_sources,
+ include_directories: [plperl_inc],
+ kwargs: pg_mod_args + {
+ 'dependencies': [perl_dep, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'jsonb_plperl.control',
+ 'jsonb_plperl--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+install_data(
+ 'jsonb_plperlu.control',
+ 'jsonb_plperlu--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'jsonb_plperl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'jsonb_plperl',
+ 'jsonb_plperlu',
+ ],
+}
diff --git a/contrib/jsonb_plpython/expected/meson.build b/contrib/jsonb_plpython/expected/meson.build
new file mode 100644
index 00000000000..3840bdd92e5
--- /dev/null
+++ b/contrib/jsonb_plpython/expected/meson.build
@@ -0,0 +1,15 @@
+foreach r2 : jsonb_plpython_regress
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+
+ s2 = '@0@.out'.format(r2)
+ s3 = '@0@.out'.format(r3)
+ jsonb_plpython3_deps += custom_target(s3,
+ input: '@0@.out'.format(r2),
+ output: '@0@.out'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ build_by_default: false,
+ install: false,
+ )
+endforeach
diff --git a/contrib/jsonb_plpython/meson.build b/contrib/jsonb_plpython/meson.build
new file mode 100644
index 00000000000..21abebf41b7
--- /dev/null
+++ b/contrib/jsonb_plpython/meson.build
@@ -0,0 +1,44 @@
+if not python3.found()
+ subdir_done()
+endif
+
+jsonb_plpython_sources = files(
+ 'jsonb_plpython.c',
+)
+
+jsonb_plpython = shared_module('jsonb_plpython3',
+ jsonb_plpython_sources,
+ include_directories: [plpython_inc],
+ kwargs: pg_mod_args + {
+ 'c_args': ['-DPLPYTHON_LIBNAME="plpython3"'] + contrib_mod_args['c_args'],
+ 'dependencies': [python3, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'jsonb_plpythonu.control',
+ 'jsonb_plpython2u.control',
+ 'jsonb_plpython3u.control',
+ 'jsonb_plpythonu--1.0.sql',
+ 'jsonb_plpython2u--1.0.sql',
+ 'jsonb_plpython3u--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+jsonb_plpython_regress = ['jsonb_plpython']
+
+jsonb_plpython3_regress = []
+jsonb_plpython3_deps = []
+
+# FIXME: this is an abysmal hack
+subdir('sql')
+subdir('expected')
+
+regress_tests += {
+ 'name': 'jsonb_plpython',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': jsonb_plpython3_regress,
+ 'deps': jsonb_plpython3_deps,
+ 'regress_args': ['--inputdir', meson.current_build_dir()],
+}
diff --git a/contrib/jsonb_plpython/sql/meson.build b/contrib/jsonb_plpython/sql/meson.build
new file mode 100644
index 00000000000..4b29029192a
--- /dev/null
+++ b/contrib/jsonb_plpython/sql/meson.build
@@ -0,0 +1,17 @@
+# Convert plpython2 regression tests to plpython3 ones
+foreach r2 : jsonb_plpython_regress
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+ jsonb_plpython3_regress += r3
+
+ s2 = '@0@.sql'.format(r2)
+ s3 = '@0@.sql'.format(r3)
+ jsonb_plpython3_deps += custom_target(s3,
+ input: '@0@.sql'.format(r2),
+ output: '@0@.sql'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ build_by_default: false,
+ install: false,
+ )
+endforeach
diff --git a/contrib/meson.build b/contrib/meson.build
new file mode 100644
index 00000000000..0d5f7315ebb
--- /dev/null
+++ b/contrib/meson.build
@@ -0,0 +1,63 @@
+contrib_mod_args = pg_mod_args
+
+contrib_data_dir = get_option('datadir') / 'extension'
+contrib_data_args = {
+ 'install_dir': contrib_data_dir
+}
+
+subdir('adminpack')
+subdir('amcheck')
+subdir('auth_delay')
+subdir('auto_explain')
+subdir('bloom')
+subdir('bool_plperl')
+subdir('btree_gin')
+subdir('btree_gist')
+subdir('citext')
+subdir('cube')
+subdir('dblink')
+subdir('dict_int')
+subdir('dict_xsyn')
+subdir('earthdistance')
+subdir('file_fdw')
+subdir('fuzzystrmatch')
+subdir('hstore')
+subdir('hstore_plperl')
+subdir('hstore_plpython')
+# TODO: intagg
+# TODO: intarray
+# TODO: isn
+subdir('jsonb_plperl')
+subdir('jsonb_plpython')
+# TODO: lo
+# TODO: ltree
+# TODO: ltree_plpython
+subdir('oid2name')
+# TODO: old_snapshot
+subdir('pageinspect')
+# TODO: passwordcheck
+# TODO: pg_buffercache
+# TODO: pgcrypto
+# TODO: pg_freespacemap
+subdir('pg_prewarm')
+# TODO: pgrowlocks
+subdir('pg_stat_statements')
+# TODO: pgstattuple
+# TODO: pg_surgery
+subdir('pg_trgm')
+subdir('pg_visibility')
+subdir('postgres_fdw')
+# TODO: seg
+# TODO: sepgsql
+subdir('spi')
+# TODO: sslinfo
+# TODO: start-scripts
+# TODO: tablefunc
+# TODO: tcn
+subdir('test_decoding')
+subdir('tsm_system_rows')
+subdir('tsm_system_time')
+subdir('unaccent')
+# TODO: uuid-ossp
+subdir('vacuumlo')
+subdir('xml2')
diff --git a/contrib/oid2name/meson.build b/contrib/oid2name/meson.build
new file mode 100644
index 00000000000..bee34d2137c
--- /dev/null
+++ b/contrib/oid2name/meson.build
@@ -0,0 +1,14 @@
+executable('oid2name',
+ ['oid2name.c'],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name' : 'oid2name',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests' :[
+ 't/001_basic.pl',
+ ]
+}
diff --git a/contrib/pageinspect/meson.build b/contrib/pageinspect/meson.build
new file mode 100644
index 00000000000..4bd5b1784e0
--- /dev/null
+++ b/contrib/pageinspect/meson.build
@@ -0,0 +1,45 @@
+pageinspect = shared_module('pageinspect',
+ files(
+ 'brinfuncs.c',
+ 'btreefuncs.c',
+ 'fsmfuncs.c',
+ 'ginfuncs.c',
+ 'gistfuncs.c',
+ 'hashfuncs.c',
+ 'heapfuncs.c',
+ 'rawpage.c',
+ ),
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'pageinspect--1.0--1.1.sql',
+ 'pageinspect--1.1--1.2.sql',
+ 'pageinspect--1.2--1.3.sql',
+ 'pageinspect--1.3--1.4.sql',
+ 'pageinspect--1.4--1.5.sql',
+ 'pageinspect--1.5--1.6.sql',
+ 'pageinspect--1.5.sql',
+ 'pageinspect--1.6--1.7.sql',
+ 'pageinspect--1.7--1.8.sql',
+ 'pageinspect--1.8--1.9.sql',
+ 'pageinspect--1.9--1.10.sql',
+ 'pageinspect.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'pageinspect',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'page',
+ 'btree',
+ 'brin',
+ 'gin',
+ 'gist',
+ 'hash',
+ 'checksum',
+ 'oldextversions',
+ ],
+}
diff --git a/contrib/pg_prewarm/meson.build b/contrib/pg_prewarm/meson.build
new file mode 100644
index 00000000000..c93ccc2db6d
--- /dev/null
+++ b/contrib/pg_prewarm/meson.build
@@ -0,0 +1,16 @@
+pg_prewarm = shared_module('pg_prewarm',
+ files(
+ 'autoprewarm.c',
+ 'pg_prewarm.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'pg_prewarm--1.0--1.1.sql',
+ 'pg_prewarm--1.1--1.2.sql',
+ 'pg_prewarm--1.1.sql',
+ 'pg_prewarm.control',
+ kwargs: contrib_data_args,
+)
diff --git a/contrib/pg_stat_statements/meson.build b/contrib/pg_stat_statements/meson.build
new file mode 100644
index 00000000000..6ed70ac0f18
--- /dev/null
+++ b/contrib/pg_stat_statements/meson.build
@@ -0,0 +1,31 @@
+pg_stat_statements = shared_module('pg_stat_statements',
+ files('pg_stat_statements.c'),
+ kwargs: contrib_mod_args + {
+ 'dependencies': contrib_mod_args['dependencies'],
+ },
+)
+
+install_data(
+ 'pg_stat_statements.control',
+ 'pg_stat_statements--1.4.sql',
+ 'pg_stat_statements--1.8--1.9.sql',
+ 'pg_stat_statements--1.7--1.8.sql',
+ 'pg_stat_statements--1.6--1.7.sql',
+ 'pg_stat_statements--1.5--1.6.sql',
+ 'pg_stat_statements--1.4--1.5.sql',
+ 'pg_stat_statements--1.3--1.4.sql',
+ 'pg_stat_statements--1.2--1.3.sql',
+ 'pg_stat_statements--1.1--1.2.sql',
+ 'pg_stat_statements--1.0--1.1.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'pg_stat_statements',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'pg_stat_statements'
+ ],
+ 'regress_args': ['--temp-config', files('pg_stat_statements.conf')],
+}
diff --git a/contrib/pg_trgm/meson.build b/contrib/pg_trgm/meson.build
new file mode 100644
index 00000000000..0a56926ad6b
--- /dev/null
+++ b/contrib/pg_trgm/meson.build
@@ -0,0 +1,33 @@
+pg_trgm = shared_module('pg_trgm',
+ files(
+ 'trgm_gin.c',
+ 'trgm_gist.c',
+ 'trgm_op.c',
+ 'trgm_regexp.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'pg_trgm--1.0--1.1.sql',
+ 'pg_trgm--1.1--1.2.sql',
+ 'pg_trgm--1.2--1.3.sql',
+ 'pg_trgm--1.3--1.4.sql',
+ 'pg_trgm--1.3.sql',
+ 'pg_trgm--1.4--1.5.sql',
+ 'pg_trgm--1.5--1.6.sql',
+ 'pg_trgm.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'pg_trgm',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'pg_trgm',
+ 'pg_word_trgm',
+ 'pg_strict_word_trgm',
+ ],
+}
diff --git a/contrib/pg_visibility/meson.build b/contrib/pg_visibility/meson.build
new file mode 100644
index 00000000000..68a7e1cf28c
--- /dev/null
+++ b/contrib/pg_visibility/meson.build
@@ -0,0 +1,25 @@
+pg_visibility = shared_module('pg_visibility',
+ files(
+ 'pg_visibility.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'pg_visibility--1.0--1.1.sql',
+ 'pg_visibility--1.1.sql',
+ 'pg_visibility--1.1--1.2.sql',
+ 'pg_visibility.control',
+ kwargs: contrib_data_args,
+)
+
+
+regress_tests += {
+ 'name': 'pg_visibility',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'pg_visibility'
+ ],
+}
diff --git a/contrib/postgres_fdw/meson.build b/contrib/postgres_fdw/meson.build
new file mode 100644
index 00000000000..507d01448b1
--- /dev/null
+++ b/contrib/postgres_fdw/meson.build
@@ -0,0 +1,31 @@
+postgres_fdw_sources = files(
+ 'connection.c',
+ 'deparse.c',
+ 'option.c',
+ 'postgres_fdw.c',
+ 'shippable.c',
+)
+
+postgres_fdw = shared_module('postgres_fdw',
+ postgres_fdw_sources,
+ kwargs: contrib_mod_args + {
+ 'dependencies': pg_mod_args['dependencies'] + [libpq],
+ },
+)
+
+install_data(
+ 'postgres_fdw.control',
+ 'postgres_fdw--1.0.sql',
+ 'postgres_fdw--1.0--1.1.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'postgres_fdw',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'postgres_fdw'
+ ],
+ 'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
+}
diff --git a/contrib/spi/meson.build b/contrib/spi/meson.build
new file mode 100644
index 00000000000..51bc96ea657
--- /dev/null
+++ b/contrib/spi/meson.build
@@ -0,0 +1,43 @@
+autoinc = shared_module('autoinc',
+ ['autoinc.c'],
+ kwargs: contrib_mod_args,
+)
+
+install_data('autoinc.control', 'autoinc--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+
+insert_username = shared_module('insert_username',
+ ['insert_username.c'],
+ kwargs: contrib_mod_args,
+)
+
+install_data('insert_username.control', 'insert_username--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+
+moddatetime = shared_module('moddatetime',
+ ['moddatetime.c'],
+ kwargs: contrib_mod_args,
+)
+
+install_data('moddatetime.control', 'moddatetime--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+# this is needed for the regression tests;
+# comment out if you want a quieter refint package for other uses
+refint_cflags = ['-DREFINT_VERBOSE']
+
+refint = shared_module('refint',
+ ['refint.c'],
+ kwargs: contrib_mod_args + {
+ 'c_args': refint_cflags + contrib_mod_args['c_args'],
+ },
+)
+
+install_data('refint.control', 'refint--1.0.sql',
+ kwargs: contrib_data_args,
+)
diff --git a/contrib/test_decoding/meson.build b/contrib/test_decoding/meson.build
new file mode 100644
index 00000000000..d26b43cbe79
--- /dev/null
+++ b/contrib/test_decoding/meson.build
@@ -0,0 +1,69 @@
+test_decoding_sources = files(
+ 'test_decoding.c',
+)
+
+test_decoding = shared_module('test_decoding',
+ test_decoding_sources,
+ kwargs: contrib_mod_args,
+)
+
+
+regress_tests += {
+ 'name': 'test_decoding',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'ddl',
+ 'xact',
+ 'rewrite',
+ 'toast',
+ 'permissions',
+ 'decoding_in_xact',
+ 'decoding_into_rel',
+ 'binary',
+ 'prepared',
+ 'replorigin',
+ 'time',
+ 'messages',
+ 'spill',
+ 'slot',
+ 'truncate',
+ 'stream',
+ 'stats',
+ 'twophase',
+ 'twophase_stream',
+ ],
+ 'regress_args': [
+ '--temp-config', files('logical.conf')
+ ]
+}
+
+isolation_tests += {
+ 'name': 'test_decoding',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'specs': [
+ 'mxact',
+ 'delayed_startup',
+ 'ondisk_startup',
+ 'concurrent_ddl_dml',
+ 'oldest_xmin',
+ 'snapshot_transfer',
+ 'subxact_without_top',
+ 'concurrent_stream',
+ 'twophase_snapshot',
+ ],
+ 'regress_args': [
+ '--temp-config', files('logical.conf')
+ ]
+}
+
+
+tap_tests += {
+ 'name': 'test_decoding',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_repl_stats.pl',
+ ],
+}
diff --git a/contrib/tsm_system_rows/meson.build b/contrib/tsm_system_rows/meson.build
new file mode 100644
index 00000000000..2c8f4487f8d
--- /dev/null
+++ b/contrib/tsm_system_rows/meson.build
@@ -0,0 +1,22 @@
+tsm_system_rows = shared_module('tsm_system_rows',
+ files(
+ 'tsm_system_rows.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'tsm_system_rows--1.0.sql',
+ 'tsm_system_rows.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'tsm_system_rows',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'tsm_system_rows',
+ ],
+}
diff --git a/contrib/tsm_system_time/meson.build b/contrib/tsm_system_time/meson.build
new file mode 100644
index 00000000000..df9c4aa4b51
--- /dev/null
+++ b/contrib/tsm_system_time/meson.build
@@ -0,0 +1,22 @@
+tsm_system_time = shared_module('tsm_system_time',
+ files(
+ 'tsm_system_time.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'tsm_system_time--1.0.sql',
+ 'tsm_system_time.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'tsm_system_time',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'tsm_system_time',
+ ],
+}
diff --git a/contrib/unaccent/meson.build b/contrib/unaccent/meson.build
new file mode 100644
index 00000000000..e77bf790d8c
--- /dev/null
+++ b/contrib/unaccent/meson.build
@@ -0,0 +1,30 @@
+unaccent = shared_module('unaccent',
+ files(
+ 'unaccent.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args,
+)
+
+install_data(
+ 'unaccent--1.0--1.1.sql',
+ 'unaccent--1.1.sql',
+ 'unaccent.control',
+ kwargs: contrib_data_args,
+)
+
+install_data(
+ 'unaccent.rules',
+ install_dir: get_option('datadir') / 'tsearch_data'
+)
+
+# XXX: Implement downlo
+regress_tests += {
+ 'name': 'unaccent',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'unaccent',
+ ],
+ 'regress_args': ['--encoding=UTF8'],
+}
diff --git a/contrib/vacuumlo/meson.build b/contrib/vacuumlo/meson.build
new file mode 100644
index 00000000000..99e76daacf9
--- /dev/null
+++ b/contrib/vacuumlo/meson.build
@@ -0,0 +1,14 @@
+executable('vacuumlo',
+ ['vacuumlo.c'],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name' : 'vacuumlo',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests' :[
+ 't/001_basic.pl',
+ ]
+}
diff --git a/contrib/xml2/meson.build b/contrib/xml2/meson.build
new file mode 100644
index 00000000000..6f8a26e4f0a
--- /dev/null
+++ b/contrib/xml2/meson.build
@@ -0,0 +1,30 @@
+if not libxml.found()
+ subdir_done()
+endif
+
+xml2 = shared_module('pgxml',
+ files(
+ 'xpath.c',
+ 'xslt_proc.c',
+ ),
+ c_pch: '../../src/include/pch/postgres_pch.h',
+ kwargs: contrib_mod_args + {
+ 'dependencies': [libxml, libxslt, contrib_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'xml2--1.0--1.1.sql',
+ 'xml2--1.1.sql',
+ 'xml2.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'xml2',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'xml2',
+ ],
+}
diff --git a/conversion_helpers.txt b/conversion_helpers.txt
new file mode 100644
index 00000000000..e5879b4fe77
--- /dev/null
+++ b/conversion_helpers.txt
@@ -0,0 +1,6 @@
+convert list of files to quoted-one-per-line:
+
+ ?\b\(\(?:\w\|\d\|_\|-\)+\)\.o ?\(?:\\
+\)? → '\1.c',
+
+
diff --git a/meson.build b/meson.build
new file mode 100644
index 00000000000..c9d123bdac3
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,1901 @@
+project('postgresql',
+ ['c'],
+ version: '15devel',
+ license: 'PostgreSQL',
+ meson_version: '>=0.54',
+ default_options: [
+ 'warning_level=2',
+ 'b_pie=true',
+ 'b_pch=false',
+ 'buildtype=release',
+ ]
+)
+
+
+
+###############################################################
+# Basic prep
+###############################################################
+
+fs = import('fs')
+
+thread_dep = dependency('threads')
+
+
+
+###############################################################
+# Version and other metadata
+###############################################################
+
+pg_version = meson.project_version()
+
+if pg_version.endswith('devel')
+ pg_version_arr = [pg_version.split('devel')[0], '0']
+elif pg_version.contains('beta')
+ pg_version_arr = pg_version.split('beta')
+elif pg_version.contains('rc')
+ pg_version_arr = pg_version.split('rc')
+else
+ pg_version_arr = pg_version.split('.')
+endif
+
+pg_version_major = pg_version_arr[0].to_int()
+pg_version_minor = pg_version_arr[1].to_int()
+
+cc = meson.get_compiler('c')
+
+cdata = configuration_data()
+
+
+cdata.set_quoted('PACKAGE_NAME', 'PostgreSQL')
+cdata.set_quoted('PACKAGE_BUGREPORT', 'pgsql-bugs@lists.postgresql.org')
+cdata.set_quoted('PACKAGE_URL', 'https://www.postgresql.org/')
+
+cdata.set_quoted('PG_VERSION', pg_version)
+cdata.set_quoted('PG_VERSION_STR', 'PostgreSQL @0@ on @1@, compiled by @2@-@3@'.format(
+ pg_version, target_machine.cpu_family(), cc.get_id(), cc.version()))
+cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())
+cdata.set('PG_MAJORVERSION_NUM', pg_version_major)
+cdata.set('PG_VERSION_NUM', (pg_version_major*10000)+pg_version_minor)
+cdata.set_quoted('CONFIGURE_ARGS', '')
+
+
+
+###############################################################
+# Search paths
+#
+# NB: Arguments added globally (via the below, or CFLAGS etc) are not taken
+# into account for configuration-time checks (so they are more
+# isolated). Flags that have to be taken into account for configure checks
+# have to be explicitly specified in configure tests.
+###############################################################
+
+g_inc = []
+g_c_args = []
+g_l_args = []
+
+if host_machine.system() == 'darwin'
+ # XXX, should this be required?
+ xcrun = find_program('xcrun', native: true, required: true)
+
+ sysroot = run_command(xcrun, '--show-sdk-path', check: true).stdout().strip()
+ message('sysroot is >@0@<'.format(sysroot))
+
+ g_c_args += ['-isysroot', sysroot]
+ g_l_args += ['-isysroot', sysroot]
+endif
+
+if host_machine.system() == 'linux' or host_machine.system() == 'cygwin'
+ g_c_args += '-D_GNU_SOURCE'
+endif
+
+g_c_inc = []
+
+g_c_inc += include_directories(get_option('extra_include_dirs'))
+g_c_lib = get_option('extra_lib_dirs')
+
+add_project_arguments(g_c_args, language: ['c', 'cpp'])
+add_project_link_arguments(g_l_args, language: ['c', 'cpp'])
+
+
+
+###############################################################
+# Program paths
+###############################################################
+
+# External programs
+perl = find_program(get_option('PERL'), required: true)
+flex = find_program(get_option('FLEX'), native: true)
+bison = find_program(get_option('BISON'), native: true, version: '>= 1.875')
+sed = find_program(get_option('SED'), 'sed', native: true)
+prove = find_program(get_option('PROVE'))
+tar = find_program(get_option('TAR'), native: true)
+gzip = find_program(get_option('GZIP'), native: true)
+touch = find_program('touch', native: true)
+
+# Internal programs
+find_meson = find_program('src/tools/find_meson', native: true)
+testwrap = find_program('src/tools/testwrap', native: true)
+
+bisonflags = []
+if bison.found()
+ bison_version_c = run_command(bison, '--version', check: true)
+ # bison version string helpfully is something like
+ # >>bison (GNU bison) 3.8.1<<
+ bison_version = bison_version_c.stdout().split(' ')[3].split('\n')[0]
+ if bison_version.version_compare('>=3.0')
+ bisonflags += ['-Wno-deprecated']
+ endif
+endif
+
+
+
+###############################################################
+# Path to meson (for tests etc)
+###############################################################
+
+# FIXME: this should really be part of meson, see
+# https://github.com/mesonbuild/meson/issues/8511
+meson_binpath_r = run_command(find_meson)
+
+if meson_binpath_r.returncode() != 0 or meson_binpath_r.stdout() == ''
+ error('huh, could not run find_meson.\nerrcode: @0@\nstdout: @1@\nstderr: @2@'.format(
+ meson_binpath_r.returncode(),
+ meson_binpath_r.stdout(),
+ meson_binpath_r.stderr()))
+endif
+
+meson_binpath_s = meson_binpath_r.stdout().split('\n')
+meson_binpath_len = meson_binpath_s.length()
+
+if meson_binpath_len < 1
+ error('unexpected introspect line @0@'.format(meson_binpath_r.stdout()))
+endif
+
+i = 0
+meson_binpath = ''
+meson_args = []
+foreach e : meson_binpath_s
+ if i == 0
+ meson_binpath = e
+ else
+ meson_args += e
+ endif
+ i += 1
+endforeach
+
+meson_bin = find_program(meson_binpath, native: true)
+
+
+
+###############################################################
+# Option Handling
+###############################################################
+
+cdata.set('USE_ASSERT_CHECKING', get_option('cassert'))
+
+cdata.set('BLCKSZ', 8192, description: '''
+ Size of a disk block --- this also limits the size of a tuple. You
+ can set it bigger if you need bigger tuples (although TOAST should
+ reduce the need to have large tuples, since fields can be spread
+ across multiple tuples).
+
+ BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ
+ is currently 2^15 (32768). This is determined by the 15-bit widths
+ of the lp_off and lp_len fields in ItemIdData (see
+ include/storage/itemid.h).
+
+ Changing BLCKSZ requires an initdb.
+''')
+
+cdata.set('XLOG_BLCKSZ', 8192)
+cdata.set('RELSEG_SIZE', 131072)
+cdata.set('DEF_PGPORT', 5432)
+cdata.set_quoted('DEF_PGPORT_STR', '5432')
+cdata.set_quoted('PG_KRB_SRVNAM', 'postgres')
+
+
+
+###############################################################
+# Library: GSSAPI
+###############################################################
+
+gssapiopt = get_option('gssapi')
+if not gssapiopt.disabled()
+ gssapi = dependency('krb5-gssapi', required: gssapiopt)
+
+ if gssapi.found() and \
+ cc.check_header('gssapi/gssapi.h', args: g_c_args, dependencies: gssapi, required: gssapiopt)
+
+ if not cc.has_function('gss_init_sec_context', args: g_c_args, dependencies: gssapi)
+ error('''could not find function 'gss_init_sec_context' required for GSSAPI''')
+ endif
+ cdata.set('ENABLE_GSS', 1)
+ endif
+
+else
+ gssapi = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: ldap
+###############################################################
+
+ldapopt = get_option('ldap')
+if not ldapopt.disabled()
+
+ if host_machine.system() == 'windows'
+ ldap = cc.find_library('wldap32')
+ ldap_r = ldap
+ else
+ ldap = dependency('ldap', required: false)
+
+ # Before 2.5 openldap didn't have a pkg-config file..
+ if ldap.found()
+ ldap_r = ldap
+ else
+ ldap = cc.find_library('ldap', required: ldapopt)
+ ldap_r = cc.find_library('ldap_r', required: ldapopt)
+
+ # Use ldap_r for FE if available, else assume ldap is thread-safe.
+ # On some platforms ldap_r fails to link without PTHREAD_LIBS.
+ if ldap.found() and not ldap_r.found()
+ ldap_r = ldap
+ endif
+ endif
+
+ if ldap.found() and cc.has_function('ldap_initialize', args: g_c_args, dependencies: [ldap, thread_dep])
+ cdata.set('HAVE_LDAP_INITIALIZE', 1)
+ endif
+ endif
+
+ if ldap.found()
+ cdata.set('USE_LDAP', 1)
+ endif
+
+else
+ ldap_r = ldap = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: LLVM
+###############################################################
+
+llvmopt = get_option('llvm')
+if not llvmopt.disabled()
+ llvm = dependency('llvm', version : '>=3.9', method: 'config-tool', required: llvmopt)
+
+ if llvm.found()
+
+ cdata.set('USE_LLVM', 1)
+
+ add_languages('cpp', required : true, native: false)
+ cpp = meson.get_compiler('cpp')
+
+ llvm_binpath = llvm.get_variable(configtool: 'bindir')
+
+ ccache = find_program('ccache', required: false)
+ clang = find_program(llvm_binpath / 'clang', required: true)
+ llvm_lto = find_program(llvm_binpath / 'llvm-lto', required: true)
+
+ # FIXME: the includes hardcoded here suck
+ llvm_irgen_args = [
+ '-c', '-o', '@OUTPUT@', '@INPUT@',
+ '-flto=thin', '-emit-llvm',
+ '-MD', '-MQ', '@OUTPUT@', '-MF', '@DEPFILE@',
+ '-I', '@SOURCE_ROOT@/src/include',
+ '-I', '@BUILD_ROOT@/src/include',
+ '-I', '@BUILD_ROOT@/src/backend/utils/misc',
+ '-I', '@CURRENT_SOURCE_DIR@',
+ '-O2',
+ '-Wno-ignored-attributes',
+ '-Wno-empty-body',
+ ]
+
+ if ccache.found()
+ llvm_irgen_command = ccache
+ llvm_irgen_args = [clang.path()] + llvm_irgen_args
+ else
+ llvm_irgen_command = clang
+ endif
+
+ llvm_irgen_kw = {
+ 'command': [llvm_irgen_command] + llvm_irgen_args,
+ 'depfile': '@BASENAME@.c.bc.d',
+ }
+
+ irlink = find_program('src/tools/irlink', native: true)
+
+ llvm_irlink_kw = {
+ 'command':[
+ irlink,
+ '@SOURCE_ROOT@',
+ '@BUILD_ROOT@',
+ llvm_lto,
+ '-o', '@OUTPUT0@',
+ '@PRIVATE_DIR@',
+ '@INPUT@',
+ ],
+ 'install': true,
+ 'install_dir': get_option('libdir'),
+ }
+
+ endif
+else
+ llvm = dependency('', required: false)
+endif
+
+
+
+###############################################################
+# Library: icu
+###############################################################
+
+if not get_option('icu').disabled()
+ icu = dependency('icu-uc', required: get_option('icu').enabled())
+ icu_i18n = dependency('icu-i18n', required: get_option('icu').enabled())
+
+ if icu.found()
+ cdata.set('USE_ICU', 1)
+ endif
+
+else
+ icu = dependency('', required : false)
+ icu_i18n = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: libxml
+###############################################################
+
+libxmlopt = get_option('libxml')
+if not libxmlopt.disabled()
+ libxml = dependency('libxml-2.0', required: libxmlopt, version: '>= 2.6.23')
+
+ if libxml.found()
+ cdata.set('USE_LIBXML', 1)
+ endif
+else
+ libxml = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: libxslt
+###############################################################
+
+libxsltopt = get_option('libxslt')
+if not libxsltopt.disabled()
+ libxslt = dependency('libxslt', required: libxsltopt)
+
+ if libxslt.found()
+ cdata.set('USE_LIBXSLT', 1)
+ endif
+else
+ libxslt = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: lz4
+###############################################################
+
+lz4opt = get_option('lz4')
+if not lz4opt.disabled()
+ lz4 = dependency('liblz4', required: lz4opt)
+
+ if lz4.found()
+ cdata.set('USE_LZ4', 1)
+ cdata.set('HAVE_LIBLZ4', 1)
+ endif
+
+else
+ lz4 = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: Perl (for plperl)
+###############################################################
+
+perlopt = get_option('perl')
+perl_dep = dependency('', required: false)
+
+if perlopt.disabled()
+ perl_may_work = false
+else
+ perl_may_work = true
+
+ perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}']
+
+ # FIXME: include copy-edited comments from perl.m4
+
+ perlversion = run_command(perl_conf_cmd, 'api_versionstring', check: true).stdout()
+ archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout()
+ privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout()
+ useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout()
+ libperl = run_command(perl_conf_cmd, 'libperl', check: true).stdout()
+
+ perl_inc = include_directories('@0@/CORE'.format(archlibexp))
+
+ perl_ccflags = []
+
+ if useshrplib != 'true'
+ if perlopt.enabled()
+ warning('need a shared perl')
+ perl_may_work = false
+ else
+ error('need a shared perl')
+ endif
+ endif
+
+ message('perl libperl: @0@'.format(libperl))
+
+ if host_machine.system() == 'darwin'
+ perl_ccflags += ['-iwithsysroot', '@0@/CORE'.format(archlibexp)]
+ endif
+
+ # FIXME macOS may need sysroot muckery
+
+ # XXX: On my system the cc.find_library() is actually enough to get a working
+ # plperl. Would be nice to get rid of the nasty stuff below.
+ if perl_may_work and \
+ cc.has_header('perl.h', args: g_c_args + perl_ccflags,
+ include_directories: perl_inc, required: perlopt)
+ foreach p : ['perl', 'libperl', libperl, libperl.strip('lib'), fs.stem(libperl), fs.stem(libperl).strip('lib')]
+ perl_dep_int = cc.find_library(p,
+ dirs: ['@0@/CORE'.format(archlibexp)],
+ required: false)
+ if perl_dep_int.found()
+ break
+ endif
+ endforeach
+
+ if not perl_dep_int.found()
+ perl_may_work = false
+ endif
+ else
+ perl_may_work = false
+ endif
+
+ if perl_may_work
+ perl_ccflags_r = run_command(perl_conf_cmd, 'ccflags', check: true).stdout()
+ message('CCFLAGS recommended by Perl: @0@'.format(perl_ccflags_r))
+
+ foreach flag : perl_ccflags_r.split(' ')
+ if flag.startswith('-D') and \
+ (not flag.startswith('-D_') or flag == '_USE_32BIT_TIME_T')
+ perl_ccflags += flag
+ endif
+ endforeach
+
+ if host_machine.system() == 'windows'
+ perl_ccflags += ['-DPLPERL_HAVE_UID_GID']
+ endif
+
+ message('CCFLAGS for embedding perl: @0@'.format(' '.join(perl_ccflags)))
+
+ # perl.m4 sayeth:
+ #
+ # We are after Embed's ldopts, but without the subset mentioned in
+ # Config's ccdlflags;
+ #
+ # FIXME: andres sayeth: But why?
+
+ ldopts = run_command(perl, '-MExtUtils::Embed', '-e', 'ldopts', check: true).stdout().strip()
+ ccdlflags = run_command(perl_conf_cmd, 'ccdlflags', check: true).stdout().strip()
+
+ ccdlflags_dict = {}
+
+ foreach ccdlflag : ccdlflags.split(' ')
+ ccdlflags_dict += {ccdlflag: 1}
+ endforeach
+
+ perl_ldopts = []
+ foreach ldopt : ldopts.split(' ')
+ if ldopt == ''
+ continue
+ elif ccdlflags_dict.has_key(ldopt)
+ continue
+ # strawberry perl unhelpfully has that in ldopts
+ elif ldopt == '-s'
+ continue
+ endif
+
+ perl_ldopts += ldopt.strip('"')
+ endforeach
+
+ # FIXME: check if windows handling is necessary
+
+ message('LDFLAGS for embedding perl: "@0@" (ccdlflags: "@1@", ldopts: "@2@")'.format(
+ ' '.join(perl_ldopts), ccdlflags, ldopts))
+
+ if perl_dep_int.found()
+ perl_dep = declare_dependency(
+ include_directories: perl_inc,
+ compile_args: perl_ccflags,
+ link_args: perl_ldopts,
+ version: perlversion,
+ )
+ endif
+ endif # perl_may_work
+
+ if perlopt.enabled() and not perl_may_work
+ error('could not find working perl')
+ endif
+endif
+
+
+
+###############################################################
+# Library: Python (for plpython)
+###############################################################
+
+pyopt = get_option('python')
+if not pyopt.disabled()
+ pm = import('python')
+ python3_inst = pm.find_installation(required: pyopt.enabled())
+ python3 = python3_inst.dependency(embed: true, required: pyopt.enabled())
+else
+ python3 = dependency('', required: false)
+endif
+
+
+
+###############################################################
+# Library: Readline
+#
+# FIXME: editline support
+###############################################################
+
+if not get_option('readline').disabled()
+ readline = dependency('readline', required: false)
+ if not readline.found()
+ readline = cc.find_library('readline',
+ required: get_option('readline').enabled())
+ endif
+
+ if readline.found()
+ cdata.set('HAVE_LIBREADLINE', 1)
+
+ if cc.has_header('readline/history.h', args: g_c_args, dependencies: [readline], required: false)
+ history_h = 'readline/history.h'
+ cdata.set('HAVE_READLINE_HISTORY_H', 1)
+ cdata.set('HAVE_READLINE_H', false)
+ elif cc.has_header('history.h', args: g_c_args, dependencies: [readline], required: false)
+ history_h = 'history.h'
+ cdata.set('HAVE_READLINE_HISTORY_H', false)
+ cdata.set('HAVE_HISTORY_H', 1)
+ else
+ error('''readline header not found
+If you have readline already installed, see see meson-log/meson-log.txt for details on the
+failure. It is possible the compiler isn't looking in the proper directory.
+Use -Dreadline=false to disable readline support.''')
+ endif
+
+ if cc.has_header('readline/readline.h', args: g_c_args, dependencies: [readline], required: false)
+ readline_h = 'readline/readline.h'
+ cdata.set('HAVE_READLINE_READLINE_H', 1)
+ elif cc.has_header('readline.h', args: g_c_args, dependencies: [readline], required: false)
+ readline_h = 'readline.h'
+ cdata.set('HAVE_READLINE_H', 1)
+ else
+ error('''readline header not found
+If you have readline already installed, see see meson-log/meson-log.txt for details on the
+failure. It is possible the compiler isn't looking in the proper directory.
+Use -Dreadline=false to disable readline support.''')
+ endif
+
+ check_funcs = [
+ 'rl_completion_matches',
+ 'rl_filename_completion_function',
+ 'rl_reset_screen_size',
+ 'append_history',
+ 'history_truncate_file',
+ ]
+
+ foreach func : check_funcs
+ cdata.set('HAVE_'+func.to_upper(),
+ cc.has_function(func, args: g_c_args, dependencies: [readline]) ? 1 : false)
+ endforeach
+
+ check_vars = [
+ 'rl_completion_append_character',
+ 'rl_completion_suppress_quote',
+ 'rl_filename_quote_characters',
+ 'rl_filename_quoting_function',
+ ]
+
+ foreach var : check_vars
+ cdata.set('HAVE_'+var.to_upper(),
+ cc.has_header_symbol(readline_h, var, args: g_c_args, dependencies: [readline]) ? 1 : false)
+ endforeach
+ endif
+else
+ readline = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: SSL
+###############################################################
+
+if get_option('ssl') == 'openssl'
+
+ # Try to find openssl via pkg-config et al, if that doesn't work, look for
+ # the library names that we know about.
+
+ # via pkg-config et al
+ ssl = dependency('openssl', required: false)
+
+ # via library + headers
+ if not ssl.found()
+ ssl_lib = cc.find_library('ssl',
+ dirs: g_c_lib,
+ header_include_directories: g_c_inc,
+ has_headers: ['openssl/ssl.h', 'openssl/err.h'])
+ crypto_lib = cc.find_library('crypto',
+ dirs: g_c_lib,
+ header_include_directories: g_c_inc)
+ ssl_int = [ssl_lib, crypto_lib]
+
+ ssl = declare_dependency(dependencies: ssl_int,
+ include_directories: g_c_inc)
+ else
+ cc.has_header('openssl/ssl.h', args: g_c_args, dependencies: ssl, required: true)
+ cc.has_header('openssl/err.h', args: g_c_args, dependencies: ssl, required: true)
+
+ ssl_int = [ssl]
+ endif
+
+ cdata.set_quoted('WITH_SSL', get_option('ssl'))
+
+ check_funcs = [
+ ['CRYPTO_new_ex_data', {'required': true}],
+ ['SSL_new', {'required': true}],
+
+ # Function introduced in OpenSSL 1.0.2.
+ ['X509_get_signature_nid'],
+
+ # Functions introduced in OpenSSL 1.1.0. We used to check for
+ # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
+ # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
+ # doesn't have these OpenSSL 1.1.0 functions. So check for individual
+ # functions.
+ ['OPENSSL_init_ssl'],
+ ['BIO_get_data'],
+ ['BIO_meth_new'],
+ ['ASN1_STRING_get0_data'],
+ ['HMAC_CTX_new'],
+ ['HMAC_CTX_free'],
+
+ # OpenSSL versions before 1.1.0 required setting callback functions, for
+ # thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
+ # function was removed.
+ ['CRYPTO_lock'],
+ ]
+
+ foreach c : check_funcs
+ func = c.get(0)
+ val = cc.has_function(func, args: g_c_args, dependencies: ssl_int)
+ if not val and c.get(1, {}).get('required', false)
+ error('openssl function @0@ is required'.format(func))
+ endif
+ cdata.set('HAVE_'+func.to_upper(), val ? 1 : false)
+ endforeach
+
+ cdata.set('USE_OPENSSL', 1,
+ description: 'Define to 1 to build with OpenSSL support. (-Dssl=openssl)')
+
+ cdata.set('OPENSSL_API_COMPAT', 0x10001000,
+ description: 'Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.')
+else
+ ssl = dependency('', required : false)
+endif
+
+
+
+###############################################################
+# Library: zlib
+###############################################################
+
+zlibopt = get_option('zlib')
+zlib = dependency('', required : false)
+if not zlibopt.disabled()
+ zlib_t = dependency('zlib', required: zlibopt)
+
+ if zlib_t.type_name() == 'internal'
+ # if fallback was used, we don't need to test if headers are present (they
+ # aren't built yet, so we can't test)
+ zlib = zlib_t
+ elif not zlib_t.found()
+ warning('did not find zlib')
+ elif not cc.has_header('zlib.h', args: g_c_args, dependencies: [zlib_t], required: zlibopt.enabled())
+ warning('zlib header not found')
+ elif not cc.has_type('z_streamp', args: g_c_args, dependencies: [zlib_t], prefix: '#include <zlib.h>')
+ if zlibopt.enabled()
+ error('zlib version is too old')
+ else
+ warning('zlib version is too old')
+ endif
+ else
+ zlib = zlib_t
+ endif
+
+ if zlib.found()
+ cdata.set('HAVE_LIBZ', 1)
+ endif
+endif
+
+
+
+###############################################################
+# Compiler tests
+###############################################################
+
+sizeof_long = cc.sizeof('long', args: g_c_args)
+if sizeof_long == 8
+ cdata.set('HAVE_LONG_INT_64', 1)
+ cdata.set('PG_INT64_TYPE', 'long int')
+ cdata.set_quoted('INT64_MODIFIER', 'l')
+elif sizeof_long == 4 and cc.sizeof('long long', args: g_c_args) == 8
+ cdata.set('HAVE_LONG_LONG_INT_64', 1)
+ cdata.set('PG_INT64_TYPE', 'long long int')
+ cdata.set_quoted('INT64_MODIFIER', 'll')
+elif
+ error('do not know how to get a 64bit int')
+endif
+
+
+cdata.set('MAXIMUM_ALIGNOF', 8)
+cdata.set('ALIGNOF_SHORT', cc.alignment('short', args: g_c_args))
+cdata.set('ALIGNOF_INT', cc.alignment('int', args: g_c_args))
+cdata.set('ALIGNOF_LONG', cc.alignment('long', args: g_c_args))
+cdata.set('ALIGNOF_DOUBLE', cc.alignment('double', args: g_c_args))
+cdata.set('SIZEOF_VOID_P', cc.sizeof('void *', args: g_c_args))
+
+# Check if the C compiler knows computed gotos (gcc extension, also
+# available in at least clang). If so, define HAVE_COMPUTED_GOTO.
+#
+# Checking whether computed gotos are supported syntax-wise ought to
+# be enough, as the syntax is otherwise illegal.
+if cc.compiles('''
+ static inline int foo(void)
+ {
+ void *labeladdrs[] = {&&my_label};
+ goto *labeladdrs[0];
+ my_label:
+ return 1;
+ }''',
+ args: g_c_args)
+ cdata.set('HAVE_COMPUTED_GOTO', 1)
+endif
+
+
+# XXX: for now just assume that compiler knows __func__ - it's C99 after all.
+cdata.set('HAVE_FUNCNAME__FUNC', 1)
+
+# Check if the C compiler understands _Static_assert(),
+# and define HAVE__STATIC_ASSERT if so.
+#
+# We actually check the syntax ({ _Static_assert(...) }), because we need
+# gcc-style compound expressions to be able to wrap the thing into macros.
+if cc.compiles('''
+ int main(int arg, char **argv)
+ {
+ ({ _Static_assert(1, "foo"); })
+ }
+ ''',
+ args: g_c_args)
+ cdata.set('HAVE__STATIC_ASSERT', 1)
+endif
+
+# We use <stdbool.h> if we have it and it declares type bool as having
+# size 1. Otherwise, c.h will fall back to declaring bool as unsigned char.
+if cc.has_type('_Bool', args: g_c_args) \
+ and cc.has_type('bool', prefix: '#include <stdbool.h>', args: g_c_args) \
+ and cc.sizeof('bool', prefix: '#include <stdbool.h>', args: g_c_args) == 1
+ cdata.set('HAVE__BOOL', 1)
+ cdata.set('PG_USE_STDBOOL', 1)
+endif
+
+
+printf_attributes = ['gnu_printf', '__syslog__', 'printf']
+testsrc = 'extern void pgac_write(int ignore, const char *fmt,...) __attribute__((format(@0@, 2,3)));'
+foreach a : printf_attributes
+ if cc.compiles(testsrc.format(a), args: g_c_args + ['-Werror'], name: 'format ' + a)
+ cdata.set('PG_PRINTF_ATTRIBUTE', a)
+ break
+ endif
+endforeach
+
+if cc.has_function_attribute('visibility:default') and \
+ cc.has_function_attribute('visibility:hidden')
+ cdata.set('HAVE_VISIBILITY_ATTRIBUTE', 1)
+endif
+
+
+if cc.has_function('__builtin_unreachable', args: g_c_args)
+ cdata.set('HAVE__BUILTIN_UNREACHABLE', 1)
+endif
+
+if cc.has_function('__builtin_constant_p', args: g_c_args)
+ cdata.set('HAVE__BUILTIN_CONSTANT_P', 1)
+
+ if host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
+ # Check if compiler accepts "i"(x) when __builtin_constant_p(x).
+ if cc.compiles('''
+ static inline int
+ addi(int ra, int si)
+ {
+ int res = 0;
+ if (__builtin_constant_p(si))
+ __asm__ __volatile__(
+ " addi %0,%1,%2\n" : "=r"(res) : "b"(ra), "i"(si));
+ return res;
+ }
+ int test_adds(int x) { return addi(3, x) + addi(x, 5); }
+ ''',
+ args: g_c_args)
+ cdata.set('HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P', 1)
+ endif
+ endif
+endif
+
+
+
+# XXX: The configure.ac check for __cpuid() is broken, we don't copy that
+# here. To prevent problems due to two detection methods working, stop
+# checking after one.
+if cc.links('''
+ #include <cpuid.h>
+ int main(int arg, char **argv)
+ {
+ unsigned int exx[4] = {0, 0, 0, 0};
+ __get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
+ }
+ ''', name: '__get_cpuid',
+ args: g_c_args)
+ cdata.set('HAVE__GET_CPUID', 1)
+elif cc.links('''
+ #include <intrin.h>
+ int main(int arg, char **argv)
+ {
+ unsigned int exx[4] = {0, 0, 0, 0};
+ __cpuid(exx, 1);
+ }
+ ''', name: '__cpuid',
+ args: g_c_args)
+ cdata.set('HAVE__CPUID', 1)
+endif
+
+
+
+###############################################################
+# Compiler flags
+###############################################################
+
+common_functional_flags = [
+ # Disable strict-aliasing rules; needed for gcc 3.3+
+ '-fno-strict-aliasing',
+ # Disable optimizations that assume no overflow; needed for gcc 4.3+
+ '-fwrapv',
+ '-fexcess-precision=standard'
+]
+
+add_project_arguments(cc.get_supported_arguments(common_functional_flags), language: 'c')
+
+vectorize_cflags = cc.get_supported_arguments(['-ftree-vectorize'])
+unroll_loops_cflags = cc.get_supported_arguments(['-funroll-loops'])
+
+
+common_warning_flags = [
+ '-Wmissing-prototypes',
+ '-Wpointer-arith',
+ '-Werror=vla',
+ '-Wendif-labels',
+ '-Wmissing-format-attribute',
+ '-Wimplicit-fallthrough=3',
+ '-Wcast-function-type',
+ '-Wformat-security',
+]
+
+add_project_arguments(cc.get_supported_arguments(common_warning_flags), language: 'c')
+
+if llvm.found()
+ add_project_arguments(cpp.get_supported_arguments(common_warning_flags), language: 'cpp')
+endif
+
+# A few places with imported code get a pass on -Wdeclaration-after-statement, remember
+# the result for them
+if cc.has_argument('-Wdeclaration-after-statement')
+ add_project_arguments('-Wdeclaration-after-statement', language: 'c')
+ using_declaration_after_statement_warning = true
+else
+ using_declaration_after_statement_warning = false
+endif
+
+
+# We want to suppress a few unhelpful warnings - but gcc won't
+# complain about unrecognized -Wno-foo switches, so we have to test
+# for the positive form and if that works, add the negative form
+
+negative_warning_flags = [
+ 'unused-command-line-argument',
+ 'format-truncation',
+ 'stringop-truncation',
+
+ # FIXME: from andres's local config
+ 'clobbered',
+ 'missing-field-initializers',
+ 'sign-compare',
+ 'unused-parameter',
+]
+
+foreach w : negative_warning_flags
+ if cc.has_argument('-W'+w)
+ add_project_arguments('-Wno-'+w, language: 'c')
+ endif
+
+ if llvm.found() and cpp.has_argument('-W'+w)
+ add_project_arguments('-Wno-'+w, language: 'cpp')
+ endif
+endforeach
+
+
+# From Project.pm
+if cc.get_id() == 'msvc'
+ add_project_arguments('/wd4018', '/wd4244', '/wd4273', '/wd4102', '/wd4090', '/wd4267',
+ language: 'c')
+ add_project_arguments('/DWIN32', '/DWINDOWS', '/D__WINDOWS__', '/D__WIN32__',
+ '/DWIN32_STACK_RLIMIT=4194304', '/D_CRT_SECURE_NO_DEPRECATE', '/D_CRT_NONSTDC_NO_DEPRECATE',
+ language: 'c')
+endif
+
+
+###############################################################
+# Atomics
+###############################################################
+
+cdata.set('HAVE_SPINLOCKS', 1)
+
+if get_option('atomics')
+ cdata.set('HAVE_ATOMICS', 1)
+
+ atomic_checks = [
+ {'name': 'HAVE_GCC__SYNC_CHAR_TAS',
+ 'desc': '__sync_lock_test_and_set(char)',
+ 'test': '''
+char lock = 0;
+__sync_lock_test_and_set(&lock, 1);
+__sync_lock_release(&lock);'''},
+
+ {'name': 'HAVE_GCC__SYNC_INT32_TAS',
+ 'desc': '__sync_lock_test_and_set(int32)',
+ 'test': '''
+int lock = 0;
+__sync_lock_test_and_set(&lock, 1);
+__sync_lock_release(&lock);'''},
+
+ {'name': 'HAVE_GCC__SYNC_INT32_CAS',
+ 'desc': '__sync_val_compare_and_swap(int32)',
+ 'test': '''
+int val = 0;
+__sync_val_compare_and_swap(&val, 0, 37);'''},
+
+# FIXME: int64 reference
+ {'name': 'HAVE_GCC__SYNC_INT64_CAS',
+ 'desc': '__sync_val_compare_and_swap(int64)',
+ 'test': '''
+long val = 0;
+__sync_val_compare_and_swap(&val, 0, 37);'''},
+
+ {'name': 'HAVE_GCC__ATOMIC_INT32_CAS',
+ 'desc': ' __atomic_compare_exchange_n(int32)',
+ 'test': '''
+int val = 0;
+int expect = 0;
+__atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);'''},
+
+# FIXME: int64 reference
+ {'name': 'HAVE_GCC__ATOMIC_INT64_CAS',
+ 'desc': ' __atomic_compare_exchange_n(int64)',
+ 'test': '''
+long val = 0;
+int expect = 0;
+__atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);'''},
+ ]
+
+ foreach check : atomic_checks
+ test = '''
+int main(void)
+{
+@0@
+}'''.format(check['test'])
+
+ cdata.set(check['name'],
+ cc.links(test, name: check['desc'], args: g_c_args))
+ endforeach
+
+endif
+
+
+
+###############################################################
+# Library / OS tests
+###############################################################
+
+header_checks = [
+ ['atomic.h'],
+ ['stdbool.h'],
+ ['copyfile.h'],
+ ['execinfo.h'],
+ ['getopt.h'],
+ ['ifaddrs.h'],
+ ['langinfo.h'],
+ ['mbarrier.h'],
+ ['poll.h'],
+ ['sys/epoll.h'],
+ ['sys/event.h'],
+ ['sys/ipc.h'],
+ ['sys/prctl.h'],
+ ['sys/procctl.h'],
+ ['sys/pstat.h'],
+ ['sys/resource.h'],
+ ['sys/select.h'],
+ ['sys/sem.h'],
+ ['sys/shm.h'],
+ ['sys/sockio.h'],
+ ['sys/tas.h'],
+ ['sys/uio.h'],
+ ['sys/un.h'],
+ ['termios.h'],
+ ['ucred.h'],
+ # FIXME: openbsd workaround
+ ['sys/ucred.h'],
+ ['wctype.h'],
+ ['netinet/tcp.h'],
+ ['net/if.h'],
+ ['crtdefs.h'],
+]
+
+foreach c : header_checks
+ varname = 'HAVE_'+c.get(0).underscorify().to_upper()
+
+ # Emulate autoconf behaviour of not-found->undef, found->1
+ found = cc.has_header(c.get(0), include_directories: g_inc, args: g_c_args)
+ cdata.set(varname, found ? 1 : false,
+ description: 'Define to 1 if you have the <@0@> header file.'.format(c))
+endforeach
+
+
+
+decl_checks = [
+ ['F_FULLFSYNC', 'fcntl.h'],
+ ['RTLD_GLOBAL', 'dlfcn.h'],
+ ['RTLD_NOW', 'dlfcn.h'],
+ ['fdatasync', 'unistd.h'],
+ ['posix_fadvise', 'fcntl.h'],
+ ['sigwait', 'signal.h'],
+ ['strlcat', 'string.h'],
+ ['strlcpy', 'string.h'],
+ ['strnlen', 'string.h'],
+ ['strsignal', 'string.h'],
+ ['strtoll', 'stdlib.h'], ['strtoull', 'stdlib.h'], # strto[u]ll may exist but not be declared
+]
+
+# Need to check for function declarations for these functions, because
+# checking for library symbols wouldn't handle deployment target
+# restrictions on macOS
+decl_checks += [
+ ['preadv', 'sys/uio.h'],
+ ['pwritev', 'sys/uio.h'],
+]
+
+foreach c : decl_checks
+ varname = 'HAVE_DECL_'+c.get(0).underscorify().to_upper()
+
+ found = cc.has_header_symbol(c.get(1), c.get(0), args: g_c_args, kwargs: c.get(2, {}))
+ cdata.set10(varname, found, description:
+'''Define to 1 if you have the declaration of `@0@\', and to 0 if you
+ don't.'''.format(c))
+endforeach
+
+
+
+# XXX: this is borked, HAVE_SYS_UCRED_H not defined
+if cc.has_type('struct cmsgcred',
+ include_directories: g_inc,
+ args: g_c_args + ['@0@'.format(cdata.get('HAVE_SYS_UCRED_H')) == 'false' ? '-DHAVE_SYS_UCRED_H' : ''],
+ prefix: '''
+#include <sys/socket.h>
+#include <sys/param.h>
+#ifdef HAVE_SYS_UCRED_H
+#include <sys/ucred.h>
+#endif''')
+ cdata.set('HAVE_STRUCT_CMSGCRED', 1)
+else
+ cdata.set('HAVE_STRUCT_CMSGCRED', false)
+endif
+
+if cc.has_function('getopt', args: g_c_args) and \
+ cc.has_function('getopt_long', args: g_c_args) and \
+ cc.has_type('struct option', args: g_c_args, prefix: '#include <getopt.h>')
+ cdata.set('HAVE_GETOPT', 1)
+ cdata.set('HAVE_GETOPT_LONG', 1)
+ cdata.set('HAVE_STRUCT_OPTION', 1)
+else
+ warning('not yet implemented')
+endif
+
+
+foreach c : ['opterr', 'optreset']
+ varname = 'HAVE_INT_'+c.underscorify().to_upper()
+
+ if cc.links('''
+#include <unistd.h>
+int main(void)
+{
+ extern int @0@;
+ @0@ = 1;
+}
+'''.format(c), name: c, args: g_c_args)
+ cdata.set(varname, 1)
+ else
+ cdata.set(varname, false)
+ endif
+endforeach
+
+
+if cc.has_type('struct sockaddr_storage', args: g_c_args, prefix: '''
+#include <sys/types.h>
+#include <sys/socket.h>''')
+ cdata.set('HAVE_STRUCT_SOCKADDR_STORAGE', 1)
+endif
+
+if cc.has_member('struct sockaddr_storage', 'ss_family', args: g_c_args,
+ prefix: '''#include <sys/types.h>
+#include <sys/socket.h>''')
+ cdata.set('HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY', 1)
+endif
+
+if cc.has_member('struct sockaddr_storage', '__ss_family', args: g_c_args,
+ prefix: '''
+#include <sys/types.h>
+#include <sys/socket.h>''')
+ cdata.set('HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY', 1)
+endif
+
+if cc.has_type('struct sockaddr_un', args: g_c_args, prefix: '''
+#include <sys/types.h>
+#include <sys/un.h>''')
+ cdata.set('HAVE_STRUCT_SOCKADDR_UN', 1)
+endif
+
+if cc.has_type('struct addrinfo', args: g_c_args, prefix: '''
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+''')
+ cdata.set('HAVE_STRUCT_ADDRINFO', 1)
+endif
+
+if host_machine.system() == 'windows'
+ cdata.set('HAVE_STRUCT_SOCKADDR_STORAGE', 1)
+ cdata.set('HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY', 1)
+endif
+
+if cc.has_type('struct sockaddr_in6', args: g_c_args, prefix: '''
+#include <netinet/in.h>''')
+ cdata.set('HAVE_IPV6', 1)
+endif
+
+
+if cc.has_member('struct tm', 'tm_zone', args: g_c_args, prefix: '''
+#include <sys/types.h>
+#include <time.h>
+''')
+ cdata.set('HAVE_STRUCT_TM_TM_ZONE', 1)
+endif
+
+if cc.compiles('''
+#include <time.h>
+extern int foo(void);
+int foo(void)
+{
+ return timezone / 60;
+}
+''', name: 'Check if the global variable `timezone\' exists', args: g_c_args,)
+ cdata.set('HAVE_INT_TIMEZONE', 1)
+else
+ cdata.set('HAVE_INT_TIMEZONE', false)
+endif
+
+# FIXME: sys/ipc.h, sys/sem.h includes were conditional
+if cc.has_type('union semun', args: g_c_args, prefix: '''
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+''')
+ cdata.set('HAVE_UNION_SEMUN', 1)
+endif
+
+if cc.compiles('''
+#include <string.h>
+int main(void)
+{
+ char buf[100];
+ switch (strerror_r(1, buf, sizeof(buf)))
+ { case 0: break; default: break; }
+}''', args: g_c_args)
+ cdata.set('STRERROR_R_INT', 1)
+else
+ cdata.set('STRERROR_R_INT', false)
+endif
+
+# FIXME
+cdata.set('pg_restrict', '__restrict')
+
+# FIXME
+if host_machine.system() == 'windows'
+ cdata.set('ACCEPT_TYPE_ARG1', 'unsigned int')
+ cdata.set('ACCEPT_TYPE_ARG2', 'struct sockaddr *')
+ cdata.set('ACCEPT_TYPE_ARG3', 'int')
+ cdata.set('ACCEPT_TYPE_RETURN', 'unsigned int PASCAL')
+else
+ cdata.set('ACCEPT_TYPE_ARG1', 'int')
+ cdata.set('ACCEPT_TYPE_ARG2', 'struct sockaddr')
+ cdata.set('ACCEPT_TYPE_ARG3', 'socklen_t')
+ cdata.set('ACCEPT_TYPE_RETURN', 'int')
+endif
+
+cdata.set('HAVE_STRUCT_ADDRINFO', 1)
+
+
+cdata.set('MEMSET_LOOP_LIMIT', 1024)
+
+
+if cc.links('''
+#include <machine/vmparam.h>
+#include <sys/exec.h>
+
+int main(void)
+{
+ PS_STRINGS->ps_nargvstr = 1;
+ PS_STRINGS->ps_argvstr = "foo";
+}
+''',
+ name: 'PS_STRINGS', args: g_c_args)
+ cdata.set('HAVE_PS_STRINGS', 1)
+else
+ cdata.set('HAVE_PS_STRINGS', false)
+endif
+
+
+# FIXME: this clearly needs to be cleaned up.
+if cc.get_id() != 'msvc'
+ # FIXME: Need to actually test
+ add_project_arguments('-msse4.2', language: 'c')
+ cdata.set('USE_SSE42_CRC32C', false)
+ cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
+else
+ cdata.set('USE_SSE42_CRC32C', false)
+ cdata.set('USE_SSE42_CRC32C_WITH_RUNTIME_CHECK', 1)
+endif
+
+
+m_dep = cc.find_library('m', required : false)
+
+# Most libraries are included only if they demonstrably provide a function we
+# need, but libm is an exception: always include it, because there are too
+# many compilers that play cute optimization games that will break probes for
+# standard functions such as pow().
+os_deps = [m_dep]
+
+rt_dep = cc.find_library('rt', required : false)
+
+dl_dep = cc.find_library('dl', required : false)
+
+util_dep = cc.find_library('util', required : false)
+posix4_dep = cc.find_library('posix4', required : false)
+
+getopt_dep = cc.find_library('getopt', required : false)
+gnugetopt_dep = cc.find_library('gnugetopt', required : false)
+
+execinfo_dep = cc.find_library('execinfo', required : false)
+
+func_checks = [
+ ['_configthreadlocale'],
+ ['backtrace_symbols', {'dependencies': [execinfo_dep]}],
+ ['clock_gettime', {'dependencies': [rt_dep, posix4_dep]}],
+ ['copyfile'],
+ ['dlopen', {'dependencies': [dl_dep]}],
+ ['explicit_bzero'],
+ ['fdatasync', {'dependencies': [rt_dep, posix4_dep]}],
+ ['fls'],
+ ['getaddrinfo'],
+ ['gethostbyname_r', {'dependencies': [thread_dep]}],
+ ['getifaddrs'],
+ ['getopt', {'dependencies': [getopt_dep, gnugetopt_dep]}],
+ ['getopt_long',{'dependencies': [getopt_dep, gnugetopt_dep]}],
+ ['getpeereid'],
+ ['getpeerucred'],
+ ['getpwuid_r', {'dependencies': [thread_dep]}],
+ ['getrlimit'],
+ ['getrusage'],
+ ['gettimeofday'], # XXX: This seems to be in the autoconf case
+ ['inet_aton'],
+ ['kqueue'],
+ ['link'],
+ ['mbstowcs_l'],
+ ['memset_s'],
+ ['mkdtemp'],
+ ['poll'],
+ ['posix_fadvise'],
+ ['posix_fallocate'],
+ ['ppoll'],
+ ['pread'],
+ ['pstat'],
+ ['pthread_is_threaded_np'],
+ ['pwrite'],
+ ['random'],
+ ['readlink'],
+ ['readv'],
+ ['setenv'], # FIXME: windows handling
+ ['setproctitle', {'dependencies': [util_dep]}],
+ ['setproctitle_fast'],
+ ['setsid'],
+ ['shm_open', {'dependencies': [rt_dep]}],
+ ['shm_unlink', {'dependencies': [rt_dep]}],
+ ['srandom'],
+ ['strchrnul'],
+ ['strerror_r', {'dependencies': [thread_dep]}],
+ ['strlcat'],
+ ['strlcpy'],
+ ['strnlen'],
+ ['strsignal'],
+ ['strtof'], # strsignal is checked separately
+ ['strtoll'], ['__strtoll'], ['strtoq'],
+ ['strtoull'], ['__strtoull'], ['strtouq'],
+ ['symlink'],
+ ['sync_file_range'],
+ ['syncfs'],
+ ['unsetenv'],
+ ['uselocale'],
+ ['wcstombs_l'],
+ ['writev'],
+]
+
+foreach c : func_checks
+ func = c.get(0)
+ kwargs = c.get(1, {})
+ deps = kwargs.get('dependencies', [])
+
+ varname = 'HAVE_'+func.underscorify().to_upper()
+
+ found = cc.has_function(func, args: g_c_args,
+ kwargs: kwargs + {'dependencies': []})
+
+ if not found
+ foreach dep : deps
+ if not dep.found()
+ continue
+ endif
+ found = cc.has_function(func, args: g_c_args,
+ kwargs: kwargs + {'dependencies': [dep]})
+ if found
+ os_deps += dep
+ break
+ endif
+ endforeach
+ endif
+
+ # Emulate autoconf behaviour of not-found->undef, found->1
+ cdata.set(varname, found ? 1 : false,
+ description: 'Define to 1 if you have the `@0@\' function.'.format(c))
+endforeach
+
+
+
+
+
+if host_machine.system() == 'linux' or host_machine.system() == 'freebsd'
+ dlsuffix = '.so'
+elif host_machine.system() == 'darwin'
+ dlsuffix = '.dylib'
+elif host_machine.system() == 'windows'
+ dlsuffix = '.dll'
+else
+ error('not yet')
+endif
+
+cdata.set_quoted('DLSUFFIX', dlsuffix)
+
+if host_machine.system() == 'windows'
+ cdata.set('USE_WIN32_SEMAPHORES', 1)
+ cdata.set('USE_WIN32_SHARED_MEMORY', 1)
+elif host_machine.system() == 'darwin'
+ cdata.set('USE_SYSV_SEMAPHORES', 1)
+ cdata.set('USE_SYSV_SHARED_MEMORY', 1)
+else
+ cdata.set('USE_UNNAMED_POSIX_SEMAPHORES', 1)
+ cdata.set('USE_SYSV_SHARED_MEMORY', 1)
+endif
+
+
+if host_machine.system() == 'windows'
+ cdata.set('HAVE_IPV6', 1)
+ cdata.set('HAVE_SYMLINK', 1)
+ cdata.set('WIN32_STACK_RLIMIT', 4194304)
+ cdata.set('HAVE__CONFIGTHREADLOCALE', 1)
+endif
+
+if cc.get_id() == 'msvc'
+ add_project_link_arguments(
+ '/fixed:no',
+ '/dynamicbase',
+ '/nxcompat',
+ language : ['c', 'cpp'],
+ )
+endif
+
+if host_machine.system() == 'windows'
+ os_deps += cc.find_library('ws2_32', required: true)
+endif
+
+
+###############################################################
+# Threading
+###############################################################
+
+# Probably not worth implementing other cases anymore
+cdata.set('ENABLE_THREAD_SAFETY', 1)
+
+if thread_dep.found()
+ if cc.has_function('pthread_is_threaded_np', args: g_c_args, dependencies: [thread_dep])
+ cdata.set('HAVE_PTHREAD_IS_THREADED_NP', 1)
+ endif
+ if cc.has_function('pthread_barrier_wait', args: g_c_args, dependencies: [thread_dep])
+ cdata.set('HAVE_PTHREAD_BARRIER_WAIT', 1)
+ endif
+endif
+
+
+###############################################################
+# Build
+###############################################################
+
+# Collect a number of lists of things while recursing through the source
+# tree. Later steps then can use those.
+
+test_deps = []
+backend_targets = []
+
+
+# List of tap tests we later generate test() invocations for. The main
+# reason for doing it that way instead of having test() invocations
+# everywhere is that they end up being too large. A second benefit is
+# that it'd make it easier to generate data for another runner.
+tap_tests = []
+isolation_tests = []
+regress_tests = []
+
+
+# Default options for targets
+
+default_target_args = {
+ 'implicit_include_directories': false,
+ 'install': true,
+}
+
+default_lib_args = default_target_args + {
+ 'name_prefix': 'lib',
+}
+
+internal_lib_args = default_lib_args + {
+ 'build_by_default': false,
+ 'install': false,
+}
+
+default_mod_args = default_lib_args + {
+ 'name_prefix': '',
+}
+
+default_bin_args = default_target_args + {
+}
+
+
+# First visit src/include - all targets creating headers are defined
+# within. That makes it easy to add the necessary dependencies for the
+# subsequent build steps.
+
+generated_headers = []
+generated_backend_headers = []
+
+postgres_inc = [include_directories('src/include')]
+
+if host_machine.system() == 'windows'
+ postgres_inc += include_directories('src/include/port/win32')
+
+ if cc.get_id() == 'msvc'
+ postgres_inc += include_directories('src/include/port/win32_msvc')
+ endif
+endif
+
+subdir('src/include')
+
+
+# Then through src/port and src/common, as most other things depend on them
+
+frontend_port_code = declare_dependency(
+ compile_args: ['-DFRONTEND'],
+ include_directories: [postgres_inc],
+ sources: [errcodes],
+ dependencies: os_deps,
+)
+
+backend_port_code = declare_dependency(
+ compile_args: ['-DBUILDING_DLL'],
+ include_directories: [postgres_inc],
+ sources: [errcodes],
+ dependencies: os_deps,
+)
+
+subdir('src/port')
+
+frontend_common_code = declare_dependency(
+ compile_args: ['-DFRONTEND'],
+ include_directories: [postgres_inc],
+ sources: generated_headers,
+ dependencies: os_deps,
+)
+
+backend_common_code = declare_dependency(
+ compile_args: ['-DBUILDING_DLL'],
+ include_directories: [postgres_inc],
+ sources: generated_headers,
+)
+
+subdir('src/common')
+
+frontend_shlib_code = declare_dependency(
+ compile_args: ['-DFRONTEND'],
+ include_directories: [postgres_inc],
+ link_with: [pgport_shlib, common_shlib],
+ sources: generated_headers,
+ dependencies: os_deps,
+)
+
+subdir('src/interfaces/libpq')
+subdir('src/fe_utils')
+
+frontend_code = declare_dependency(
+ compile_args: ['-DFRONTEND'],
+ include_directories: [postgres_inc],
+ link_with: [pgport_static, common_static, fe_utils],
+ sources: generated_headers,
+ dependencies: os_deps,
+)
+
+backend_code = declare_dependency(
+ compile_args: ['-DBUILDING_DLL'],
+ include_directories: [postgres_inc],
+ link_with: [],
+ sources: generated_headers + generated_backend_headers,
+ dependencies: [os_deps, ssl, lz4, icu, icu_i18n, ldap, gssapi, libxml],
+)
+
+# Note there's intentionally no dependency on pgport/common here - we want the
+# symbols from the main binary for extension modules, rather than the
+# extension linking separately to pgport/common.
+backend_mod_code = declare_dependency(
+ compile_args: [],
+ include_directories: [postgres_inc],
+ link_with: [],
+ sources: generated_headers + generated_backend_headers,
+ dependencies: [os_deps, ssl, lz4, icu, icu_i18n, ldap, gssapi, libxml],
+)
+
+# Then through the main sources. That way contrib can have dependencies on
+# main sources. Note that this explicitly doesn't enter src/test, right now a
+# few regression tests depend on contrib files.
+
+subdir('src')
+
+subdir('contrib')
+
+subdir('src/test')
+
+
+###############################################################
+# Test prep
+###############################################################
+
+# The determination of where a DESTDIR install points to is ugly, it's somewhat hard
+# to combine two absolute paths portably...
+
+prefix = get_option('prefix')
+
+test_prefix = prefix
+
+if fs.is_absolute(get_option('prefix'))
+ if host_machine.system() == 'windows'
+ if prefix.split(':\\').length() == 1
+ # just a drive
+ test_prefix = ''
+ else
+ test_prefix = prefix.split(':\\')[1]
+ endif
+ else
+ test_prefix = prefix.substring(1)
+ endif
+endif
+
+# DESTDIR for the installation used to run tests in
+test_install_destdir = meson.build_root() / 'tmp_install/'
+# DESTDIR + prefix appropriately munged
+test_install_location = test_install_destdir / test_prefix
+
+
+test('tmp_install',
+ meson_bin, args: meson_args + ['install', '--quiet', '--only-changed', '--no-rebuild'],
+ env: {'DESTDIR':test_install_destdir},
+ priority: 100,
+ is_parallel: false,
+ suite: ['setup'])
+
+test_result_dir = meson.build_root() / 'testrun'
+
+
+# XXX: pg_regress doesn't assign unique ports on windows. To avoid the
+# inevitable conflicts from running tests in parallel, hackishly assign
+# different ports for different tests.
+
+testport=40000
+
+test_env = environment()
+
+if host_machine.system() == 'darwin'
+ library_path_var = 'DYLD_LIBRARY_PATH'
+elif host_machine.system() == 'aix'
+ library_path_var = 'LIBPATH'
+else
+ library_path_var = 'LD_LIBRARY_PATH'
+endif
+
+test_env.prepend('PATH', test_install_location / get_option('bindir'))
+test_env.prepend(library_path_var, test_install_location / get_option('libdir'))
+test_env.set('PG_REGRESS', meson.build_root() / 'src/test/regress/pg_regress')
+test_env.set('REGRESS_SHLIB', regress_module.full_path())
+
+
+###############################################################
+# Test Generation
+###############################################################
+
+# Define all 'pg_regress' style tests
+foreach t : regress_tests
+ test_command = [
+ pg_regress,
+ '--temp-instance', test_result_dir / t['name'] / 'pg_regress' / 'tmp_check',
+ '--inputdir', t['sd'],
+ '--outputdir', test_result_dir / t['name'] / 'pg_regress',
+ '--bindir', '',
+ '--dlpath', t['bd'],
+ '--max-concurrent-tests=20',
+ '--port=@0@'.format(testport),
+ ]
+
+ if t.has_key('regress_args')
+ test_command += t['regress_args']
+ endif
+
+ if t.has_key('schedule')
+ test_command += ['--schedule', t['schedule'],]
+ else
+ test_command += t['sql']
+ endif
+
+ test_kwargs = {
+ 'suite': ['pg_regress', t['name']],
+ 'priority': 10,
+ 'timeout': 300,
+ 'depends': test_deps + t.get('deps', []),
+ 'env': test_env,
+ 'workdir': t['sd'],
+ 'args': [
+ meson.build_root(),
+ t['bd'],
+ t['name'],
+ 'pg_regress',
+ test_command,
+ ]
+ }
+
+ # Allow test definition to override arguments
+ if t.has_key('test_kwargs')
+ test_kwargs += t['test_kwargs']
+ endif
+
+ test(t['name'] / 'pg_regress',
+ testwrap,
+ kwargs: test_kwargs,
+ )
+
+ testport = testport + 1
+endforeach
+
+
+# Define all 'isolationtester' style tests
+foreach t : isolation_tests
+ test_command = [
+ pg_isolation_regress,
+ '--temp-instance', test_result_dir / t['name'] / 'isolation' / 'tmp_check',
+ '--inputdir', t['sd'],
+ '--outputdir', test_result_dir / t['name'] / 'isolation',
+ '--bindir', '',
+ '--dlpath', t['bd'],
+ '--max-concurrent-tests=20',
+ '--port=@0@'.format(testport),
+ ]
+
+ if t.has_key('regress_args')
+ test_command += t['regress_args']
+ endif
+
+ if t.has_key('schedule')
+ test_command += ['--schedule', t['schedule'],]
+ else
+ test_command += t['specs']
+ endif
+
+ test_kwargs = {
+ 'suite': ['isolation', t['name']],
+ 'priority': 20,
+ 'timeout': 300,
+ 'depends': test_deps + t.get('deps', []),
+ 'workdir': t['sd'],
+ 'env': test_env,
+ 'args': [
+ meson.build_root(),
+ t['bd'],
+ t['name'],
+ 'isolation',
+ test_command,
+ ]
+ }
+
+ # Allow test definition to override arguments
+ if t.has_key('test_kwargs')
+ test_kwargs += t['test_kwargs']
+ endif
+
+ test(t['name'] / 'isolation',
+ testwrap,
+ kwargs: test_kwargs,
+ )
+
+ testport = testport + 1
+endforeach
+
+
+# Define all 'tap' style tests
+# FIXME: dependencies for each test
+foreach t : tap_tests
+ env = test_env
+
+ foreach name, value : t.get('env', {})
+ if name == 'PATH'
+ # FIXME: manually setting PATH again, because repeated prepend didn't work
+ # before meson 0.58.
+ env.prepend('PATH', value, test_install_location / get_option('bindir'))
+ else
+ env.set(name, value)
+ endif
+ endforeach
+
+ foreach onetap : t['tests']
+ test(t['name'] / onetap,
+ testwrap,
+ workdir: t['sd'],
+ args: [
+ meson.build_root(),
+ t['bd'],
+ t['name'],
+ onetap,
+ 'perl',
+ '-I', meson.source_root() / 'src/test/perl',
+ '-I', t['sd'],
+ t['sd'] / onetap
+ ],
+ protocol: 'tap',
+ suite: ['tap', t['name']],
+ env: env,
+ depends: test_deps + t.get('deps', []),
+ timeout: 300,
+ )
+ endforeach
+endforeach
+
+
+
+###############################################################
+# Pseudo targets
+###############################################################
+
+alias_target('backend', backend_targets)
+
+
+
+###############################################################
+# The End, The End, My Friend
+###############################################################
+
+if meson.version().version_compare('>=0.57')
+
+ summary({
+ 'Data Block Size' : cdata.get('BLCKSZ'),
+ 'WAL Block Size' : cdata.get('XLOG_BLCKSZ')
+ }, section: 'Data Layout'
+ )
+
+ summary(
+ {
+ 'host system' : '@0@ @1@'.format(host_machine.system(), host_machine.cpu_family()),
+ 'build system' : '@0@ @1@'.format(build_machine.system(), build_machine.cpu_family()),
+ },
+ section: 'System'
+ )
+
+ summary(
+ {
+ 'linker': '@0@'.format(cc.get_linker_id()),
+ 'C compiler': '@0@ @1@'.format(cc.get_id(), cc.version()),
+ },
+ section: 'Compiler'
+ )
+
+ if llvm.found()
+ summary(
+ {
+ 'C++ compiler': '@0@ @1@'.format(cpp.get_id(), cpp.version())
+ },
+ section: 'Compiler')
+ endif
+
+ summary(
+ {
+ 'bison' : '@0@ @1@'.format(bison.full_path(), bison_version),
+ },
+ section: 'Programs'
+ )
+
+ summary(
+ {
+ 'GSS': gssapi,
+ 'LDAP': ldap,
+ 'LLVM': llvm,
+ 'icu': icu,
+ 'libxml': libxml,
+ 'libxslt': libxslt,
+ 'lz4': lz4,
+ 'perl': perl_dep,
+ 'python3': python3,
+ 'readline': readline,
+ 'ssl': ssl,
+ 'zlib': zlib,
+ },
+ section: 'External Libraries'
+ )
+
+endif
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000000..d4c7f717ff8
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,81 @@
+# Data layout influencing options
+option('BLCKSZ', type : 'combo', choices : ['1', '2', '4', '8', '16', '32'], value : '8',
+ description: 'set table block size in kB')
+
+
+# You get it
+option('cassert', type : 'boolean', value: false,
+ description: 'enable assertion checks (for debugging)')
+
+option('atomics', type : 'boolean', value: true,
+ description: 'whether to use atomic operations')
+
+
+# Compilation options
+
+option('extra_include_dirs', type : 'array',
+ description: 'non-default directories to be searched for headers')
+option('extra_lib_dirs', type : 'array',
+ description: 'non-default directories to be searched for libs')
+
+
+# External dependencies
+
+option('gssapi', type : 'feature', value: 'auto',
+ description: 'GSSAPI support')
+
+option('ldap', type : 'feature', value: 'auto',
+ description: 'LDAP support')
+
+option('llvm', type : 'feature', value: 'disabled',
+ description: 'whether to use llvm')
+
+option('icu', type : 'feature', value: 'auto',
+ description: 'ICU support')
+
+option('libxml', type : 'feature', value: 'auto',
+ description: 'XML support')
+
+option('libxslt', type : 'feature', value: 'auto',
+ description: 'XSLT support in contrib/xml2')
+
+option('lz4', type : 'feature', value: 'auto',
+ description: 'LZ4 support')
+
+option('perl', type : 'feature', value: 'auto',
+ description: 'build Perl modules (PL/Perl)')
+
+option('python', type : 'feature', value: 'auto',
+ description: 'build Python modules (PL/Python)')
+
+option('readline', type : 'feature', value : 'auto',
+ description: 'use GNU Readline or BSD Libedit for editing')
+
+option('ssl', type : 'combo', choices : ['none', 'openssl'], value : 'none',
+ description: 'use LIB for SSL/TLS support (openssl)')
+
+option('zlib', type : 'feature', value: 'auto',
+ description: 'whether to use zlib')
+
+
+# Programs
+option('BISON', type : 'string', value: 'bison',
+ description: 'path to bison binary')
+
+option('FLEX', type : 'string', value: 'flex',
+ description: 'path to flex binary')
+
+option('GZIP', type : 'string', value: 'gzip',
+ description: 'path to gzip binary')
+
+option('PERL', type : 'string', value: 'perl',
+ description: 'path to perl binary')
+
+option('PROVE', type : 'string', value: 'prove',
+ description: 'path to prove binary')
+
+option('SED', type : 'string', value: 'gsed',
+ description: 'path to sed binary')
+
+option('TAR', type : 'string', value: 'tar',
+ description: 'path to tar binary')
diff --git a/src/backend/access/brin/meson.build b/src/backend/access/brin/meson.build
new file mode 100644
index 00000000000..a54c7532927
--- /dev/null
+++ b/src/backend/access/brin/meson.build
@@ -0,0 +1,12 @@
+backend_sources += files(
+ 'brin.c',
+ 'brin_bloom.c',
+ 'brin_inclusion.c',
+ 'brin_minmax.c',
+ 'brin_minmax_multi.c',
+ 'brin_pageops.c',
+ 'brin_revmap.c',
+ 'brin_tuple.c',
+ 'brin_validate.c',
+ 'brin_xlog.c',
+)
diff --git a/src/backend/access/common/meson.build b/src/backend/access/common/meson.build
new file mode 100644
index 00000000000..857beaa32d3
--- /dev/null
+++ b/src/backend/access/common/meson.build
@@ -0,0 +1,18 @@
+backend_sources += files(
+ 'attmap.c',
+ 'bufmask.c',
+ 'detoast.c',
+ 'heaptuple.c',
+ 'indextuple.c',
+ 'printsimple.c',
+ 'printtup.c',
+ 'relation.c',
+ 'reloptions.c',
+ 'scankey.c',
+ 'session.c',
+ 'syncscan.c',
+ 'toast_compression.c',
+ 'toast_internals.c',
+ 'tupconvert.c',
+ 'tupdesc.c',
+)
diff --git a/src/backend/access/gin/meson.build b/src/backend/access/gin/meson.build
new file mode 100644
index 00000000000..56d6f343d54
--- /dev/null
+++ b/src/backend/access/gin/meson.build
@@ -0,0 +1,17 @@
+backend_sources += files(
+ 'ginarrayproc.c',
+ 'ginbtree.c',
+ 'ginbulk.c',
+ 'gindatapage.c',
+ 'ginentrypage.c',
+ 'ginfast.c',
+ 'ginget.c',
+ 'gininsert.c',
+ 'ginlogic.c',
+ 'ginpostinglist.c',
+ 'ginscan.c',
+ 'ginutil.c',
+ 'ginvacuum.c',
+ 'ginvalidate.c',
+ 'ginxlog.c',
+)
diff --git a/src/backend/access/gist/meson.build b/src/backend/access/gist/meson.build
new file mode 100644
index 00000000000..1a996b5e25d
--- /dev/null
+++ b/src/backend/access/gist/meson.build
@@ -0,0 +1,13 @@
+backend_sources += files(
+ 'gist.c',
+ 'gistbuild.c',
+ 'gistbuildbuffers.c',
+ 'gistget.c',
+ 'gistproc.c',
+ 'gistscan.c',
+ 'gistsplit.c',
+ 'gistutil.c',
+ 'gistvacuum.c',
+ 'gistvalidate.c',
+ 'gistxlog.c',
+)
diff --git a/src/backend/access/hash/meson.build b/src/backend/access/hash/meson.build
new file mode 100644
index 00000000000..22f2c691c34
--- /dev/null
+++ b/src/backend/access/hash/meson.build
@@ -0,0 +1,12 @@
+backend_sources += files(
+ 'hash.c',
+ 'hash_xlog.c',
+ 'hashfunc.c',
+ 'hashinsert.c',
+ 'hashovfl.c',
+ 'hashpage.c',
+ 'hashsearch.c',
+ 'hashsort.c',
+ 'hashutil.c',
+ 'hashvalidate.c',
+)
diff --git a/src/backend/access/heap/meson.build b/src/backend/access/heap/meson.build
new file mode 100644
index 00000000000..f1dca73743c
--- /dev/null
+++ b/src/backend/access/heap/meson.build
@@ -0,0 +1,11 @@
+backend_sources += files(
+ 'heapam.c',
+ 'heapam_handler.c',
+ 'heapam_visibility.c',
+ 'heaptoast.c',
+ 'hio.c',
+ 'pruneheap.c',
+ 'rewriteheap.c',
+ 'vacuumlazy.c',
+ 'visibilitymap.c',
+)
diff --git a/src/backend/access/index/meson.build b/src/backend/access/index/meson.build
new file mode 100644
index 00000000000..18af5533e65
--- /dev/null
+++ b/src/backend/access/index/meson.build
@@ -0,0 +1,6 @@
+backend_sources += files(
+ 'amapi.c',
+ 'amvalidate.c',
+ 'genam.c',
+ 'indexam.c',
+)
diff --git a/src/backend/access/meson.build b/src/backend/access/meson.build
new file mode 100644
index 00000000000..9874291fc0a
--- /dev/null
+++ b/src/backend/access/meson.build
@@ -0,0 +1,13 @@
+subdir('brin')
+subdir('common')
+subdir('gin')
+subdir('gist')
+subdir('hash')
+subdir('heap')
+subdir('index')
+subdir('nbtree')
+subdir('rmgrdesc')
+subdir('spgist')
+subdir('table')
+subdir('tablesample')
+subdir('transam')
diff --git a/src/backend/access/nbtree/meson.build b/src/backend/access/nbtree/meson.build
new file mode 100644
index 00000000000..07dc29e8190
--- /dev/null
+++ b/src/backend/access/nbtree/meson.build
@@ -0,0 +1,13 @@
+backend_sources += files(
+ 'nbtcompare.c',
+ 'nbtdedup.c',
+ 'nbtinsert.c',
+ 'nbtpage.c',
+ 'nbtree.c',
+ 'nbtsearch.c',
+ 'nbtsort.c',
+ 'nbtsplitloc.c',
+ 'nbtutils.c',
+ 'nbtvalidate.c',
+ 'nbtxlog.c',
+)
diff --git a/src/backend/access/rmgrdesc/meson.build b/src/backend/access/rmgrdesc/meson.build
new file mode 100644
index 00000000000..f3a6e0a571b
--- /dev/null
+++ b/src/backend/access/rmgrdesc/meson.build
@@ -0,0 +1,26 @@
+# used by frontend programs like pg_waldump
+rmgr_desc_sources = files(
+ 'brindesc.c',
+ 'clogdesc.c',
+ 'committsdesc.c',
+ 'dbasedesc.c',
+ 'genericdesc.c',
+ 'gindesc.c',
+ 'gistdesc.c',
+ 'hashdesc.c',
+ 'heapdesc.c',
+ 'logicalmsgdesc.c',
+ 'mxactdesc.c',
+ 'nbtdesc.c',
+ 'relmapdesc.c',
+ 'replorigindesc.c',
+ 'seqdesc.c',
+ 'smgrdesc.c',
+ 'spgdesc.c',
+ 'standbydesc.c',
+ 'tblspcdesc.c',
+ 'xactdesc.c',
+ 'xlogdesc.c',
+)
+
+backend_sources += rmgr_desc_sources
diff --git a/src/backend/access/spgist/meson.build b/src/backend/access/spgist/meson.build
new file mode 100644
index 00000000000..f18d0d2e53f
--- /dev/null
+++ b/src/backend/access/spgist/meson.build
@@ -0,0 +1,13 @@
+backend_sources += files(
+ 'spgdoinsert.c',
+ 'spginsert.c',
+ 'spgkdtreeproc.c',
+ 'spgproc.c',
+ 'spgquadtreeproc.c',
+ 'spgscan.c',
+ 'spgtextproc.c',
+ 'spgutils.c',
+ 'spgvacuum.c',
+ 'spgvalidate.c',
+ 'spgxlog.c',
+)
diff --git a/src/backend/access/table/meson.build b/src/backend/access/table/meson.build
new file mode 100644
index 00000000000..66c706d640e
--- /dev/null
+++ b/src/backend/access/table/meson.build
@@ -0,0 +1,6 @@
+backend_sources += files(
+ 'table.c',
+ 'tableam.c',
+ 'tableamapi.c',
+ 'toast_helper.c',
+)
diff --git a/src/backend/access/tablesample/meson.build b/src/backend/access/tablesample/meson.build
new file mode 100644
index 00000000000..63ee8203226
--- /dev/null
+++ b/src/backend/access/tablesample/meson.build
@@ -0,0 +1,5 @@
+backend_sources += files(
+ 'bernoulli.c',
+ 'system.c',
+ 'tablesample.c',
+)
diff --git a/src/backend/access/transam/meson.build b/src/backend/access/transam/meson.build
new file mode 100644
index 00000000000..fe3703e0f21
--- /dev/null
+++ b/src/backend/access/transam/meson.build
@@ -0,0 +1,28 @@
+backend_sources += files(
+ 'clog.c',
+ 'commit_ts.c',
+ 'generic_xlog.c',
+ 'multixact.c',
+ 'parallel.c',
+ 'rmgr.c',
+ 'slru.c',
+ 'subtrans.c',
+ 'timeline.c',
+ 'transam.c',
+ 'twophase.c',
+ 'twophase_rmgr.c',
+ 'varsup.c',
+ 'xact.c',
+ 'xlog.c',
+ 'xlogarchive.c',
+ 'xlogfuncs.c',
+ 'xloginsert.c',
+ 'xlogutils.c',
+)
+
+# used by frontend programs to built a frontend xlogreader
+xlogreader_sources = files(
+ 'xlogreader.c',
+)
+
+backend_sources += xlogreader_sources
diff --git a/src/backend/bootstrap/meson.build b/src/backend/bootstrap/meson.build
new file mode 100644
index 00000000000..55c0be68cc4
--- /dev/null
+++ b/src/backend/bootstrap/meson.build
@@ -0,0 +1,12 @@
+backend_sources += files(
+ 'bootstrap.c')
+
+bootscanner = custom_target('bootscanner',
+ input: ['bootscanner.l'],
+ output: ['bootscanner.c'],
+ command: [flex, '-o', '@OUTPUT@', '@INPUT@'])
+
+generated_backend_sources += custom_target('bootparse',
+ input: ['bootparse.y', bootscanner[0]],
+ output: ['bootparse.c'],
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
diff --git a/src/backend/catalog/meson.build b/src/backend/catalog/meson.build
new file mode 100644
index 00000000000..2cc23582e35
--- /dev/null
+++ b/src/backend/catalog/meson.build
@@ -0,0 +1,41 @@
+backend_sources += files(
+ 'aclchk.c',
+ 'catalog.c',
+ 'dependency.c',
+ 'heap.c',
+ 'index.c',
+ 'indexing.c',
+ 'namespace.c',
+ 'objectaccess.c',
+ 'objectaddress.c',
+ 'partition.c',
+ 'pg_aggregate.c',
+ 'pg_cast.c',
+ 'pg_class.c',
+ 'pg_collation.c',
+ 'pg_constraint.c',
+ 'pg_conversion.c',
+ 'pg_db_role_setting.c',
+ 'pg_depend.c',
+ 'pg_enum.c',
+ 'pg_inherits.c',
+ 'pg_largeobject.c',
+ 'pg_namespace.c',
+ 'pg_operator.c',
+ 'pg_proc.c',
+ 'pg_publication.c',
+ 'pg_range.c',
+ 'pg_shdepend.c',
+ 'pg_subscription.c',
+ 'pg_type.c',
+ 'storage.c',
+ 'toasting.c',
+)
+
+
+install_data(
+ 'information_schema.sql',
+ 'sql_features.txt',
+ 'system_functions.sql',
+ 'system_views.sql',
+ install_dir: 'share/')
diff --git a/src/backend/commands/meson.build b/src/backend/commands/meson.build
new file mode 100644
index 00000000000..8e73b29a263
--- /dev/null
+++ b/src/backend/commands/meson.build
@@ -0,0 +1,50 @@
+backend_sources += files(
+ 'aggregatecmds.c',
+ 'alter.c',
+ 'amcmds.c',
+ 'analyze.c',
+ 'async.c',
+ 'cluster.c',
+ 'collationcmds.c',
+ 'comment.c',
+ 'constraint.c',
+ 'conversioncmds.c',
+ 'copy.c',
+ 'copyfrom.c',
+ 'copyfromparse.c',
+ 'copyto.c',
+ 'createas.c',
+ 'dbcommands.c',
+ 'define.c',
+ 'discard.c',
+ 'dropcmds.c',
+ 'event_trigger.c',
+ 'explain.c',
+ 'extension.c',
+ 'foreigncmds.c',
+ 'functioncmds.c',
+ 'indexcmds.c',
+ 'lockcmds.c',
+ 'matview.c',
+ 'opclasscmds.c',
+ 'operatorcmds.c',
+ 'policy.c',
+ 'portalcmds.c',
+ 'prepare.c',
+ 'proclang.c',
+ 'publicationcmds.c',
+ 'schemacmds.c',
+ 'seclabel.c',
+ 'sequence.c',
+ 'statscmds.c',
+ 'subscriptioncmds.c',
+ 'tablecmds.c',
+ 'tablespace.c',
+ 'trigger.c',
+ 'tsearchcmds.c',
+ 'typecmds.c',
+ 'user.c',
+ 'vacuum.c',
+ 'variable.c',
+ 'view.c',
+)
diff --git a/src/backend/executor/meson.build b/src/backend/executor/meson.build
new file mode 100644
index 00000000000..518674cfa28
--- /dev/null
+++ b/src/backend/executor/meson.build
@@ -0,0 +1,67 @@
+backend_sources += files(
+ 'execAmi.c',
+ 'execAsync.c',
+ 'execCurrent.c',
+ 'execExpr.c',
+ 'execExprInterp.c',
+ 'execGrouping.c',
+ 'execIndexing.c',
+ 'execJunk.c',
+ 'execMain.c',
+ 'execParallel.c',
+ 'execPartition.c',
+ 'execProcnode.c',
+ 'execReplication.c',
+ 'execSRF.c',
+ 'execScan.c',
+ 'execTuples.c',
+ 'execUtils.c',
+ 'functions.c',
+ 'instrument.c',
+ 'nodeAgg.c',
+ 'nodeAppend.c',
+ 'nodeBitmapAnd.c',
+ 'nodeBitmapHeapscan.c',
+ 'nodeBitmapIndexscan.c',
+ 'nodeBitmapOr.c',
+ 'nodeCtescan.c',
+ 'nodeCustom.c',
+ 'nodeForeignscan.c',
+ 'nodeFunctionscan.c',
+ 'nodeGather.c',
+ 'nodeGatherMerge.c',
+ 'nodeGroup.c',
+ 'nodeHash.c',
+ 'nodeHashjoin.c',
+ 'nodeIncrementalSort.c',
+ 'nodeIndexonlyscan.c',
+ 'nodeIndexscan.c',
+ 'nodeLimit.c',
+ 'nodeLockRows.c',
+ 'nodeMaterial.c',
+ 'nodeMemoize.c',
+ 'nodeMergeAppend.c',
+ 'nodeMergejoin.c',
+ 'nodeModifyTable.c',
+ 'nodeNamedtuplestorescan.c',
+ 'nodeNestloop.c',
+ 'nodeProjectSet.c',
+ 'nodeRecursiveunion.c',
+ 'nodeResult.c',
+ 'nodeSamplescan.c',
+ 'nodeSeqscan.c',
+ 'nodeSetOp.c',
+ 'nodeSort.c',
+ 'nodeSubplan.c',
+ 'nodeSubqueryscan.c',
+ 'nodeTableFuncscan.c',
+ 'nodeTidrangescan.c',
+ 'nodeTidscan.c',
+ 'nodeUnique.c',
+ 'nodeValuesscan.c',
+ 'nodeWindowAgg.c',
+ 'nodeWorktablescan.c',
+ 'spi.c',
+ 'tqueue.c',
+ 'tstoreReceiver.c',
+)
diff --git a/src/backend/foreign/meson.build b/src/backend/foreign/meson.build
new file mode 100644
index 00000000000..57463db92c1
--- /dev/null
+++ b/src/backend/foreign/meson.build
@@ -0,0 +1,3 @@
+backend_sources += files(
+ 'foreign.c'
+)
diff --git a/src/backend/jit/llvm/meson.build b/src/backend/jit/llvm/meson.build
new file mode 100644
index 00000000000..83a90770bca
--- /dev/null
+++ b/src/backend/jit/llvm/meson.build
@@ -0,0 +1,41 @@
+if llvm.found()
+
+ llvmjit_sources = []
+
+ # Infrastructure
+ llvmjit_sources += files(
+ 'llvmjit.c',
+ 'llvmjit_error.cpp',
+ 'llvmjit_inline.cpp',
+ 'llvmjit_wrap.cpp',
+ )
+
+ # Code generation
+ llvmjit_sources += files(
+ 'llvmjit_deform.c',
+ 'llvmjit_expr.c',
+ )
+
+ llvmjit = shared_module('llvmjit',
+ llvmjit_sources,
+ kwargs: pg_mod_args + {
+ 'dependencies': pg_mod_args['dependencies'] + [llvm],
+ }
+ )
+
+ backend_targets += llvmjit
+
+ # Note this is intentionally is not installed to bitcodedir, as it's not
+ # for inlining
+ llvmjit_types = custom_target('llvmjit_types.bc',
+ kwargs: llvm_irgen_kw + {
+ 'input': 'llvmjit_types.c',
+ 'output': 'llvmjit_types.bc',
+ 'depends': [postgres],
+ 'install': true,
+ 'install_dir': get_option('libdir')
+ }
+ )
+ backend_targets += llvmjit_types
+
+endif
diff --git a/src/backend/jit/meson.build b/src/backend/jit/meson.build
new file mode 100644
index 00000000000..63cd33a4bed
--- /dev/null
+++ b/src/backend/jit/meson.build
@@ -0,0 +1,3 @@
+backend_sources += files(
+ 'jit.c'
+)
diff --git a/src/backend/lib/meson.build b/src/backend/lib/meson.build
new file mode 100644
index 00000000000..53292563d34
--- /dev/null
+++ b/src/backend/lib/meson.build
@@ -0,0 +1,12 @@
+backend_sources += files(
+ 'binaryheap.c',
+ 'bipartite_match.c',
+ 'bloomfilter.c',
+ 'dshash.c',
+ 'hyperloglog.c',
+ 'ilist.c',
+ 'integerset.c',
+ 'knapsack.c',
+ 'pairingheap.c',
+ 'rbtree.c'
+)
diff --git a/src/backend/libpq/meson.build b/src/backend/libpq/meson.build
new file mode 100644
index 00000000000..49867647155
--- /dev/null
+++ b/src/backend/libpq/meson.build
@@ -0,0 +1,28 @@
+backend_sources += files(
+ 'auth-sasl.c',
+ 'auth-scram.c',
+ 'auth.c',
+ 'be-fsstubs.c',
+ 'be-secure-common.c',
+ 'be-secure.c',
+ 'crypt.c',
+ 'hba.c',
+ 'ifaddr.c',
+ 'pqcomm.c',
+ 'pqformat.c',
+ 'pqmq.c',
+ 'pqsignal.c',
+)
+
+if ssl.found()
+ backend_sources += files('be-secure-openssl.c')
+endif
+
+if gssapi.found()
+ backend_sources += files(
+ 'be-secure-gssapi.c',
+ 'be-gssapi-common.c'
+ )
+endif
+
+install_data('pg_hba.conf.sample', 'pg_ident.conf.sample', install_dir: 'share/')
diff --git a/src/backend/main/meson.build b/src/backend/main/meson.build
new file mode 100644
index 00000000000..241e125f089
--- /dev/null
+++ b/src/backend/main/meson.build
@@ -0,0 +1,2 @@
+main_file = files('main.c')
+backend_sources += main_file
diff --git a/src/backend/meson.build b/src/backend/meson.build
new file mode 100644
index 00000000000..b84f947bc7e
--- /dev/null
+++ b/src/backend/meson.build
@@ -0,0 +1,191 @@
+backend_build_deps = [backend_code]
+backend_deps = [dl_dep, thread_dep]
+backend_sources = []
+backend_link_with = [pgport_srv, common_srv]
+backend_c_args = []
+
+generated_backend_sources = []
+
+subdir('access')
+subdir('bootstrap')
+subdir('catalog')
+subdir('commands')
+subdir('executor')
+subdir('foreign')
+subdir('jit')
+subdir('lib')
+subdir('libpq')
+subdir('main')
+subdir('nodes')
+subdir('optimizer')
+subdir('parser')
+subdir('partitioning')
+subdir('port')
+subdir('postmaster')
+subdir('regex')
+subdir('replication')
+subdir('rewrite')
+subdir('statistics')
+subdir('storage')
+subdir('tcop')
+subdir('tsearch')
+subdir('utils')
+
+
+if host_machine.system() == 'windows'
+ backend_deps += cc.find_library('secur32', required: true)
+endif
+
+
+postgres_link_args = []
+postgres_link_depends = []
+
+# On windows when compiling with msvc we need to make postgres export all its
+# symbols so that extension libraries can use them. For that we need to scan
+# the constituting objects and generate a file specifying all the functions as
+# exported (variables need an "import" declaration in the header, hence
+# PGDLLEXPORT, but functions work without that, due to import libraries
+# basically being trampolines).
+#
+#
+# On meson there's currently no easy way to do this that I found. So we build
+# a static library with all the input objects, run our script to generate
+# exports, and build the final executable using that static library
+#
+#
+# XXX: This needs to be improved.
+#
+
+# NB: There's an outer and inner layer of == windows checks, to allow to
+# exercise most of this on !windows, by widening the outer "layer".
+
+if cc.get_id() == 'msvc' # or true
+
+ postgres_lib = static_library('postgres_lib',
+ backend_sources + timezone_sources + generated_backend_sources,
+ link_whole: backend_link_with,
+ c_pch: '../include/pch/postgres_pch.h',
+ c_args: backend_c_args,
+ implicit_include_directories: false,
+ dependencies: backend_build_deps,
+ build_by_default: false,
+ install: false,
+ )
+
+ postgres_def = custom_target('postgres.def',
+ command: [perl, files('../tools/msvc/gendef2.pl'), 'x64', '@OUTPUT@', '@PRIVATE_DIR@', '@INPUT@'],
+ input: [postgres_lib, common_srv, pgport_srv],
+ output: 'postgres.def',
+ depends: [postgres_lib, common_srv, pgport_srv],
+ install: false,
+ )
+
+ if cc.get_id() == 'msvc'
+ postgres_link_args += '/DEF:@0@'.format(postgres_def.full_path())
+ postgres_link_args += '/STACK:@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))
+ postgres_link_depends += postgres_def
+ endif
+
+ # Unfortunately the msvc linker whines when building an executable with just
+ # libraries, hence the reuse of the 'main' object directly.
+
+ postgres = executable('postgres',
+ objects: [postgres_lib.extract_objects(main_file)],
+ link_with: [postgres_lib],
+ link_args: postgres_link_args,
+ link_depends: postgres_link_depends,
+ dependencies: backend_deps,
+ export_dynamic: true,
+ implib: true,
+ kwargs: default_bin_args,
+ )
+
+else
+
+ postgres = executable('postgres',
+ backend_sources + generated_backend_sources + timezone_sources,
+ c_pch: '../include/pch/postgres_pch.h',
+ c_args: backend_c_args,
+ link_with: backend_link_with,
+ export_dynamic: true,
+ dependencies: [backend_build_deps, backend_deps],
+ kwargs: default_bin_args,
+ )
+
+endif
+
+backend_targets += postgres
+
+pg_mod_args = default_mod_args + {
+ 'dependencies': [backend_mod_code],
+ 'c_args': [],
+ 'cpp_args': [],
+ }
+
+if cdata.has('HAVE_VISIBILITY_ATTRIBUTE')
+ pg_mod_args = pg_mod_args + {
+ 'c_args': pg_mod_args['c_args'] + ['-fvisibility=hidden'],
+ 'cpp_args': pg_mod_args['c_args'] + ['-fvisibility=hidden', '-fvisibility-inlines-hidden'],
+ }
+endif
+
+# Windows / MacOs link shared modules against postgres. To avoid unnecessary
+# build-time dependencies on other operating systems, only add it when
+# necessary.
+if host_machine.system() == 'windows' or host_machine.system() == 'darwin'
+ pg_mod_args = pg_mod_args + {'link_with': [postgres]}
+endif
+if host_machine.system() == 'darwin'
+ pg_mod_args = pg_mod_args + {'link_args': ['-bundle_loader', '@0@'.format(postgres.full_path())]}
+endif
+
+
+# Shared modules that, on some OSs, link against the server binary. Only enter
+# these after we defined the server build.
+
+subdir('jit/llvm')
+subdir('replication/libpqwalreceiver')
+subdir('replication/pgoutput')
+subdir('snowball')
+subdir('utils/mb/conversion_procs')
+
+
+if llvm.found()
+
+ # custom_target() insists on targetting files into the current
+ # directory. But we have files with the same name in different
+ # subdirectories. generators() don't have that problem, but their results
+ # are not installable. The irlink command copies the files for us.
+ #
+ # FIXME: this needs to be in a central place
+ #
+ # generator and custom_'t accept CustomTargetIndex as 'depends', nor do they
+ # like targets with more than one output. However, a custom target accepts
+ # them as input without a problem. So we have the below transitive target :(
+
+ transitive_depend_target = custom_target('stamp',
+ input: generated_headers + generated_backend_headers + generated_backend_sources,
+ output: 'stamp',
+ command: [touch, '@OUTPUT@'],
+ install: false)
+
+ llvm_gen = generator(llvm_irgen_command,
+ arguments: llvm_irgen_args + g_c_args,
+ depends: transitive_depend_target,
+ depfile: '@BASENAME@.c.bc.d',
+ output: ['@PLAINNAME@.bc']
+ )
+
+ bc_backend_sources = llvm_gen.process(backend_sources,
+ preserve_path_from: meson.current_source_dir())
+
+ postgres_llvm = custom_target('postgres.index.bc',
+ kwargs: llvm_irlink_kw + {
+ 'input': bc_backend_sources,
+ 'output': ['bitcode'],
+ },
+ )
+
+ backend_targets += postgres_llvm
+
+endif
diff --git a/src/backend/nodes/meson.build b/src/backend/nodes/meson.build
new file mode 100644
index 00000000000..9fca83fba44
--- /dev/null
+++ b/src/backend/nodes/meson.build
@@ -0,0 +1,17 @@
+backend_sources += files(
+ 'bitmapset.c',
+ 'copyfuncs.c',
+ 'equalfuncs.c',
+ 'extensible.c',
+ 'list.c',
+ 'makefuncs.c',
+ 'nodeFuncs.c',
+ 'nodes.c',
+ 'outfuncs.c',
+ 'params.c',
+ 'print.c',
+ 'read.c',
+ 'readfuncs.c',
+ 'tidbitmap.c',
+ 'value.c',
+)
diff --git a/src/backend/optimizer/geqo/meson.build b/src/backend/optimizer/geqo/meson.build
new file mode 100644
index 00000000000..c04f1dc2dfd
--- /dev/null
+++ b/src/backend/optimizer/geqo/meson.build
@@ -0,0 +1,17 @@
+backend_sources += files(
+ 'geqo_copy.c',
+ 'geqo_cx.c',
+ 'geqo_erx.c',
+ 'geqo_eval.c',
+ 'geqo_main.c',
+ 'geqo_misc.c',
+ 'geqo_mutation.c',
+ 'geqo_ox1.c',
+ 'geqo_ox2.c',
+ 'geqo_pmx.c',
+ 'geqo_pool.c',
+ 'geqo_px.c',
+ 'geqo_random.c',
+ 'geqo_recombination.c',
+ 'geqo_selection.c',
+)
diff --git a/src/backend/optimizer/meson.build b/src/backend/optimizer/meson.build
new file mode 100644
index 00000000000..1ab1d9934ae
--- /dev/null
+++ b/src/backend/optimizer/meson.build
@@ -0,0 +1,5 @@
+subdir('geqo')
+subdir('path')
+subdir('plan')
+subdir('prep')
+subdir('util')
diff --git a/src/backend/optimizer/path/meson.build b/src/backend/optimizer/path/meson.build
new file mode 100644
index 00000000000..310042e7aee
--- /dev/null
+++ b/src/backend/optimizer/path/meson.build
@@ -0,0 +1,11 @@
+backend_sources += files(
+ 'allpaths.c',
+ 'clausesel.c',
+ 'costsize.c',
+ 'equivclass.c',
+ 'indxpath.c',
+ 'joinpath.c',
+ 'joinrels.c',
+ 'pathkeys.c',
+ 'tidpath.c',
+)
diff --git a/src/backend/optimizer/plan/meson.build b/src/backend/optimizer/plan/meson.build
new file mode 100644
index 00000000000..22ec65a3845
--- /dev/null
+++ b/src/backend/optimizer/plan/meson.build
@@ -0,0 +1,10 @@
+backend_sources += files(
+ 'analyzejoins.c',
+ 'createplan.c',
+ 'initsplan.c',
+ 'planagg.c',
+ 'planmain.c',
+ 'planner.c',
+ 'setrefs.c',
+ 'subselect.c',
+)
diff --git a/src/backend/optimizer/prep/meson.build b/src/backend/optimizer/prep/meson.build
new file mode 100644
index 00000000000..4549a5b0e79
--- /dev/null
+++ b/src/backend/optimizer/prep/meson.build
@@ -0,0 +1,7 @@
+backend_sources += files(
+ 'prepagg.c',
+ 'prepjointree.c',
+ 'prepqual.c',
+ 'preptlist.c',
+ 'prepunion.c',
+)
diff --git a/src/backend/optimizer/util/meson.build b/src/backend/optimizer/util/meson.build
new file mode 100644
index 00000000000..e7ceaf566b5
--- /dev/null
+++ b/src/backend/optimizer/util/meson.build
@@ -0,0 +1,16 @@
+backend_sources += files(
+ 'appendinfo.c',
+ 'clauses.c',
+ 'inherit.c',
+ 'joininfo.c',
+ 'orclauses.c',
+ 'paramassign.c',
+ 'pathnode.c',
+ 'placeholder.c',
+ 'plancat.c',
+ 'predtest.c',
+ 'relnode.c',
+ 'restrictinfo.c',
+ 'tlist.c',
+ 'var.c',
+)
diff --git a/src/backend/parser/meson.build b/src/backend/parser/meson.build
new file mode 100644
index 00000000000..491eacf20bb
--- /dev/null
+++ b/src/backend/parser/meson.build
@@ -0,0 +1,43 @@
+backend_sources += files(
+ 'analyze.c',
+ 'parse_agg.c',
+ 'parse_clause.c',
+ 'parse_coerce.c',
+ 'parse_collate.c',
+ 'parse_cte.c',
+ 'parse_enr.c',
+ 'parse_expr.c',
+ 'parse_func.c',
+ 'parse_node.c',
+ 'parse_oper.c',
+ 'parse_param.c',
+ 'parse_relation.c',
+ 'parse_target.c',
+ 'parse_type.c',
+ 'parse_utilcmd.c',
+ 'scansup.c',
+)
+
+# Build a small utility static lib for the parser. This makes it easier to not
+# depend on gram.h already having been generated for most of the other code
+# (which depends on generated headers having been generated). The generation
+# of the parser is slow...
+
+parser_sources = [files('parser.c')]
+
+backend_scanner = custom_target('scan',
+ input: ['scan.l'],
+ output: ['scan.c'],
+ command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT0@'])
+parser_sources += backend_scanner[0]
+
+parser_sources += backend_parser_header[0]
+parser_sources += backend_parser_header[1]
+
+parser = static_library('parser',
+ parser_sources + generated_headers,
+ c_pch: '../../include/pch/c_pch.h',
+ dependencies: [backend_code],
+ kwargs: default_lib_args + {'install': false},
+)
+backend_link_with += parser
diff --git a/src/backend/partitioning/meson.build b/src/backend/partitioning/meson.build
new file mode 100644
index 00000000000..e5e3806a0cc
--- /dev/null
+++ b/src/backend/partitioning/meson.build
@@ -0,0 +1,5 @@
+backend_sources += files(
+ 'partbounds.c',
+ 'partdesc.c',
+ 'partprune.c',
+)
diff --git a/src/backend/port/meson.build b/src/backend/port/meson.build
new file mode 100644
index 00000000000..f1bf7f6d929
--- /dev/null
+++ b/src/backend/port/meson.build
@@ -0,0 +1,28 @@
+backend_sources += files(
+ 'atomics.c',
+)
+
+
+if cdata.has('USE_UNNAMED_POSIX_SEMAPHORES') or cdata.has('USE_NAMED_POSIX_SEMAPHORES')
+ backend_sources += files('posix_sema.c')
+endif
+
+if cdata.has('USE_SYSV_SEMAPHORES')
+ backend_sources += files('sysv_sema.c')
+endif
+
+if cdata.has('USE_WIN32_SEMAPHORES')
+ backend_sources += files('win32_sema.c')
+endif
+
+if cdata.has('USE_SYSV_SHARED_MEMORY')
+ backend_sources += files('sysv_shmem.c')
+endif
+
+if cdata.has('USE_WIN32_SHARED_MEMORY')
+ backend_sources += files('win32_shmem.c')
+endif
+
+if host_machine.system() == 'windows'
+ subdir('win32')
+endif
diff --git a/src/backend/port/win32/meson.build b/src/backend/port/win32/meson.build
new file mode 100644
index 00000000000..68fe4cc3cd0
--- /dev/null
+++ b/src/backend/port/win32/meson.build
@@ -0,0 +1,6 @@
+backend_sources += files(
+ 'crashdump.c',
+ 'signal.c',
+ 'socket.c',
+ 'timer.c',
+)
diff --git a/src/backend/postmaster/meson.build b/src/backend/postmaster/meson.build
new file mode 100644
index 00000000000..803405683e2
--- /dev/null
+++ b/src/backend/postmaster/meson.build
@@ -0,0 +1,15 @@
+backend_sources += files(
+ 'autovacuum.c',
+ 'auxprocess.c',
+ 'bgworker.c',
+ 'bgwriter.c',
+ 'checkpointer.c',
+ 'fork_process.c',
+ 'interrupt.c',
+ 'pgarch.c',
+ 'pgstat.c',
+ 'postmaster.c',
+ 'startup.c',
+ 'syslogger.c',
+ 'walwriter.c',
+)
diff --git a/src/backend/regex/meson.build b/src/backend/regex/meson.build
new file mode 100644
index 00000000000..d08e21cd6d6
--- /dev/null
+++ b/src/backend/regex/meson.build
@@ -0,0 +1,15 @@
+backend_sources += files(
+ 'regcomp.c',
+ 'regerror.c',
+ 'regexec.c',
+ 'regexport.c',
+ 'regfree.c',
+ 'regprefix.c'
+)
+
+#FIXME
+# mark inclusion dependencies between .c files explicitly
+#regcomp.o: regcomp.c regc_lex.c regc_color.c regc_nfa.c regc_cvec.c \
+# regc_locale.c regc_pg_locale.c
+#
+#regexec.o: regexec.c rege_dfa.c
diff --git a/src/backend/replication/libpqwalreceiver/meson.build b/src/backend/replication/libpqwalreceiver/meson.build
new file mode 100644
index 00000000000..3fc786c80a0
--- /dev/null
+++ b/src/backend/replication/libpqwalreceiver/meson.build
@@ -0,0 +1,13 @@
+libpqwalreceiver_sources = files(
+ 'libpqwalreceiver.c',
+)
+
+libpqwalreceiver = shared_module('pqwalreceiver',
+ libpqwalreceiver_sources,
+ kwargs: pg_mod_args + {
+ 'name_prefix': 'lib',
+ 'dependencies': pg_mod_args['dependencies'] + [libpq],
+ }
+)
+
+backend_targets += libpqwalreceiver
diff --git a/src/backend/replication/logical/meson.build b/src/backend/replication/logical/meson.build
new file mode 100644
index 00000000000..773583a12ba
--- /dev/null
+++ b/src/backend/replication/logical/meson.build
@@ -0,0 +1,14 @@
+backend_sources += files(
+ 'decode.c',
+ 'launcher.c',
+ 'logical.c',
+ 'logicalfuncs.c',
+ 'message.c',
+ 'origin.c',
+ 'proto.c',
+ 'relation.c',
+ 'reorderbuffer.c',
+ 'snapbuild.c',
+ 'tablesync.c',
+ 'worker.c',
+)
diff --git a/src/backend/replication/meson.build b/src/backend/replication/meson.build
new file mode 100644
index 00000000000..2573f166d79
--- /dev/null
+++ b/src/backend/replication/meson.build
@@ -0,0 +1,42 @@
+backend_sources += files(
+ 'backup_manifest.c',
+ 'basebackup.c',
+ 'slot.c',
+ 'slotfuncs.c',
+ 'syncrep.c',
+ 'walreceiver.c',
+ 'walreceiverfuncs.c',
+ 'walsender.c',
+)
+
+# [sync]repl_scanner is compiled as part of [sync]repl_gram. The
+# ordering is enforced by making the generation of grammar depend on
+# the scanner generation. That's unnecessarily strict, but overall
+# harmless.
+
+repl_scanner = custom_target('repl_scanner',
+ input : files('repl_scanner.l'),
+ output : ['repl_scanner.c'],
+ command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+)
+
+generated_backend_sources += custom_target('repl_gram',
+ input: 'repl_gram.y',
+ output: 'repl_gram.c',
+ depends: repl_scanner,
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
+
+
+syncrep_scanner = custom_target('syncrep_scanner',
+ input: 'syncrep_scanner.l',
+ output: 'syncrep_scanner.c',
+ command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@'])
+
+generated_backend_sources += custom_target('syncrep_gram',
+ input: 'syncrep_gram.y',
+ output: 'syncrep_gram.c',
+ depends: syncrep_scanner,
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
+
+
+subdir('logical')
diff --git a/src/backend/replication/pgoutput/meson.build b/src/backend/replication/pgoutput/meson.build
new file mode 100644
index 00000000000..8ff0a0c6133
--- /dev/null
+++ b/src/backend/replication/pgoutput/meson.build
@@ -0,0 +1,11 @@
+pgoutput_sources = files(
+ 'pgoutput.c',
+)
+
+pgoutput = shared_module('pgoutput',
+ pgoutput_sources,
+ kwargs: pg_mod_args + {
+ }
+)
+
+backend_targets += pgoutput
diff --git a/src/backend/rewrite/meson.build b/src/backend/rewrite/meson.build
new file mode 100644
index 00000000000..032e2e409b5
--- /dev/null
+++ b/src/backend/rewrite/meson.build
@@ -0,0 +1,9 @@
+backend_sources += files(
+ 'rewriteDefine.c',
+ 'rewriteHandler.c',
+ 'rewriteManip.c',
+ 'rewriteRemove.c',
+ 'rewriteSearchCycle.c',
+ 'rewriteSupport.c',
+ 'rowsecurity.c'
+)
diff --git a/src/backend/snowball/meson.build b/src/backend/snowball/meson.build
new file mode 100644
index 00000000000..b1e52e9a0c3
--- /dev/null
+++ b/src/backend/snowball/meson.build
@@ -0,0 +1,83 @@
+dict_snowball_sources = files(
+ 'dict_snowball.c',
+ 'libstemmer/api.c',
+ 'libstemmer/utilities.c',
+)
+
+dict_snowball_sources += files(
+ 'libstemmer/stem_ISO_8859_1_basque.c',
+ 'libstemmer/stem_ISO_8859_1_catalan.c',
+ 'libstemmer/stem_ISO_8859_1_danish.c',
+ 'libstemmer/stem_ISO_8859_1_dutch.c',
+ 'libstemmer/stem_ISO_8859_1_english.c',
+ 'libstemmer/stem_ISO_8859_1_finnish.c',
+ 'libstemmer/stem_ISO_8859_1_french.c',
+ 'libstemmer/stem_ISO_8859_1_german.c',
+ 'libstemmer/stem_ISO_8859_1_indonesian.c',
+ 'libstemmer/stem_ISO_8859_1_irish.c',
+ 'libstemmer/stem_ISO_8859_1_italian.c',
+ 'libstemmer/stem_ISO_8859_1_norwegian.c',
+ 'libstemmer/stem_ISO_8859_1_porter.c',
+ 'libstemmer/stem_ISO_8859_1_portuguese.c',
+ 'libstemmer/stem_ISO_8859_1_spanish.c',
+ 'libstemmer/stem_ISO_8859_1_swedish.c',
+ 'libstemmer/stem_ISO_8859_2_hungarian.c',
+ 'libstemmer/stem_ISO_8859_2_romanian.c',
+ 'libstemmer/stem_KOI8_R_russian.c',
+ 'libstemmer/stem_UTF_8_arabic.c',
+ 'libstemmer/stem_UTF_8_armenian.c',
+ 'libstemmer/stem_UTF_8_basque.c',
+ 'libstemmer/stem_UTF_8_catalan.c',
+ 'libstemmer/stem_UTF_8_danish.c',
+ 'libstemmer/stem_UTF_8_dutch.c',
+ 'libstemmer/stem_UTF_8_english.c',
+ 'libstemmer/stem_UTF_8_finnish.c',
+ 'libstemmer/stem_UTF_8_french.c',
+ 'libstemmer/stem_UTF_8_german.c',
+ 'libstemmer/stem_UTF_8_greek.c',
+ 'libstemmer/stem_UTF_8_hindi.c',
+ 'libstemmer/stem_UTF_8_hungarian.c',
+ 'libstemmer/stem_UTF_8_indonesian.c',
+ 'libstemmer/stem_UTF_8_irish.c',
+ 'libstemmer/stem_UTF_8_italian.c',
+ 'libstemmer/stem_UTF_8_lithuanian.c',
+ 'libstemmer/stem_UTF_8_nepali.c',
+ 'libstemmer/stem_UTF_8_norwegian.c',
+ 'libstemmer/stem_UTF_8_porter.c',
+ 'libstemmer/stem_UTF_8_portuguese.c',
+ 'libstemmer/stem_UTF_8_romanian.c',
+ 'libstemmer/stem_UTF_8_russian.c',
+ 'libstemmer/stem_UTF_8_serbian.c',
+ 'libstemmer/stem_UTF_8_spanish.c',
+ 'libstemmer/stem_UTF_8_swedish.c',
+ 'libstemmer/stem_UTF_8_tamil.c',
+ 'libstemmer/stem_UTF_8_turkish.c',
+ 'libstemmer/stem_UTF_8_yiddish.c',
+)
+
+# see comment in src/include/snowball/header.h
+stemmer_inc = include_directories('../../include/snowball')
+
+dict_snowball = shared_module('dict_snowball',
+ dict_snowball_sources,
+ c_pch: '../../include/pch/postgres_pch.h',
+ kwargs: pg_mod_args + {
+ 'include_directories': [stemmer_inc],
+ }
+)
+
+snowball_create = custom_target('snowball_create',
+ input: ['snowball_create.pl'],
+ output: ['snowball_create.sql'],
+ depfile: 'snowball_create.dep',
+ command: [perl, '@INPUT0@', '--input', '@CURRENT_SOURCE_DIR@', '--output', '@OUTDIR@'],
+ install: true,
+ install_dir: get_option('datadir'))
+
+# FIXME: check whether the logic to select languages currently in Makefile is needed
+install_subdir('stopwords',
+ install_dir: get_option('datadir') / 'tsearch_data',
+ strip_directory: true)
+
+backend_targets += dict_snowball
+backend_targets += snowball_create
diff --git a/src/backend/statistics/meson.build b/src/backend/statistics/meson.build
new file mode 100644
index 00000000000..8530c55f73c
--- /dev/null
+++ b/src/backend/statistics/meson.build
@@ -0,0 +1,6 @@
+backend_sources += files(
+ 'dependencies.c',
+ 'extended_stats.c',
+ 'mcv.c',
+ 'mvdistinct.c',
+)
diff --git a/src/backend/storage/buffer/meson.build b/src/backend/storage/buffer/meson.build
new file mode 100644
index 00000000000..56a59b52484
--- /dev/null
+++ b/src/backend/storage/buffer/meson.build
@@ -0,0 +1,7 @@
+backend_sources += files(
+ 'buf_init.c',
+ 'buf_table.c',
+ 'bufmgr.c',
+ 'freelist.c',
+ 'localbuf.c',
+)
diff --git a/src/backend/storage/file/meson.build b/src/backend/storage/file/meson.build
new file mode 100644
index 00000000000..e1d5047d4aa
--- /dev/null
+++ b/src/backend/storage/file/meson.build
@@ -0,0 +1,8 @@
+backend_sources += files(
+ 'buffile.c',
+ 'copydir.c',
+ 'fd.c',
+ 'fileset.c',
+ 'reinit.c',
+ 'sharedfileset.c',
+)
diff --git a/src/backend/storage/freespace/meson.build b/src/backend/storage/freespace/meson.build
new file mode 100644
index 00000000000..e4200ea6527
--- /dev/null
+++ b/src/backend/storage/freespace/meson.build
@@ -0,0 +1,5 @@
+backend_sources += files(
+ 'freespace.c',
+ 'fsmpage.c',
+ 'indexfsm.c',
+)
diff --git a/src/backend/storage/ipc/meson.build b/src/backend/storage/ipc/meson.build
new file mode 100644
index 00000000000..516bc1d0193
--- /dev/null
+++ b/src/backend/storage/ipc/meson.build
@@ -0,0 +1,20 @@
+backend_sources += files(
+ 'barrier.c',
+ 'dsm.c',
+ 'dsm_impl.c',
+ 'ipc.c',
+ 'ipci.c',
+ 'latch.c',
+ 'pmsignal.c',
+ 'procarray.c',
+ 'procsignal.c',
+ 'shm_mq.c',
+ 'shm_toc.c',
+ 'shmem.c',
+ 'shmqueue.c',
+ 'signalfuncs.c',
+ 'sinval.c',
+ 'sinvaladt.c',
+ 'standby.c',
+
+)
diff --git a/src/backend/storage/large_object/meson.build b/src/backend/storage/large_object/meson.build
new file mode 100644
index 00000000000..8a181ab9b34
--- /dev/null
+++ b/src/backend/storage/large_object/meson.build
@@ -0,0 +1,3 @@
+backend_sources += files(
+ 'inv_api.c',
+)
diff --git a/src/backend/storage/lmgr/meson.build b/src/backend/storage/lmgr/meson.build
new file mode 100644
index 00000000000..938e7f89894
--- /dev/null
+++ b/src/backend/storage/lmgr/meson.build
@@ -0,0 +1,18 @@
+backend_sources += files(
+ 'condition_variable.c',
+ 'deadlock.c',
+ 'lmgr.c',
+ 'lock.c',
+ 'lwlock.c',
+ 'predicate.c',
+ 'proc.c',
+ 's_lock.c',
+ 'spin.c',
+)
+
+lwlocknames_backend = custom_target('lwlocknames',
+ input : files('lwlocknames.txt'),
+ output : ['lwlocknames.c', 'lwlocknames.h'],
+ command : [perl, files('generate-lwlocknames.pl'), '-o', '@OUTDIR@', '@INPUT@']
+)
+generated_backend_sources += lwlocknames_backend[0]
diff --git a/src/backend/storage/meson.build b/src/backend/storage/meson.build
new file mode 100644
index 00000000000..daad628d74c
--- /dev/null
+++ b/src/backend/storage/meson.build
@@ -0,0 +1,9 @@
+subdir('buffer')
+subdir('file')
+subdir('freespace')
+subdir('ipc')
+subdir('large_object')
+subdir('lmgr')
+subdir('page')
+subdir('smgr')
+subdir('sync')
diff --git a/src/backend/storage/page/meson.build b/src/backend/storage/page/meson.build
new file mode 100644
index 00000000000..2ecd16c952c
--- /dev/null
+++ b/src/backend/storage/page/meson.build
@@ -0,0 +1,5 @@
+backend_sources += files(
+ 'bufpage.c',
+ 'checksum.c',
+ 'itemptr.c',
+)
diff --git a/src/backend/storage/smgr/meson.build b/src/backend/storage/smgr/meson.build
new file mode 100644
index 00000000000..fdeb1223b32
--- /dev/null
+++ b/src/backend/storage/smgr/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'md.c',
+ 'smgr.c',
+)
diff --git a/src/backend/storage/sync/meson.build b/src/backend/storage/sync/meson.build
new file mode 100644
index 00000000000..05148b91a8e
--- /dev/null
+++ b/src/backend/storage/sync/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'sync.c',
+
+)
diff --git a/src/backend/tcop/meson.build b/src/backend/tcop/meson.build
new file mode 100644
index 00000000000..fb54aae8122
--- /dev/null
+++ b/src/backend/tcop/meson.build
@@ -0,0 +1,8 @@
+backend_sources += files(
+ 'cmdtag.c',
+ 'dest.c',
+ 'fastpath.c',
+ 'postgres.c',
+ 'pquery.c',
+ 'utility.c',
+)
diff --git a/src/backend/tsearch/meson.build b/src/backend/tsearch/meson.build
new file mode 100644
index 00000000000..460036b6d4c
--- /dev/null
+++ b/src/backend/tsearch/meson.build
@@ -0,0 +1,21 @@
+backend_sources += files(
+ 'dict.c',
+ 'dict_ispell.c',
+ 'dict_simple.c',
+ 'dict_synonym.c',
+ 'dict_thesaurus.c',
+ 'regis.c',
+ 'spell.c',
+ 'to_tsany.c',
+ 'ts_locale.c',
+ 'ts_parse.c',
+ 'ts_selfuncs.c',
+ 'ts_typanalyze.c',
+ 'ts_utils.c',
+ 'wparser.c',
+ 'wparser_def.c',
+)
+
+install_subdir('dicts',
+ install_dir: get_option('datadir') / 'tsearch_data',
+ strip_directory: true)
diff --git a/src/backend/utils/activity/meson.build b/src/backend/utils/activity/meson.build
new file mode 100644
index 00000000000..cef26eb564b
--- /dev/null
+++ b/src/backend/utils/activity/meson.build
@@ -0,0 +1,5 @@
+backend_sources += files(
+ 'backend_progress.c',
+ 'backend_status.c',
+ 'wait_event.c',
+)
diff --git a/src/backend/utils/adt/meson.build b/src/backend/utils/adt/meson.build
new file mode 100644
index 00000000000..086fde8ff09
--- /dev/null
+++ b/src/backend/utils/adt/meson.build
@@ -0,0 +1,118 @@
+backend_sources += files(
+ 'acl.c',
+ 'amutils.c',
+ 'array_expanded.c',
+ 'array_selfuncs.c',
+ 'array_typanalyze.c',
+ 'array_userfuncs.c',
+ 'arrayfuncs.c',
+ 'arraysubs.c',
+ 'arrayutils.c',
+ 'ascii.c',
+ 'bool.c',
+ 'cash.c',
+ 'char.c',
+ 'cryptohashfuncs.c',
+ 'date.c',
+ 'datetime.c',
+ 'datum.c',
+ 'dbsize.c',
+ 'domains.c',
+ 'encode.c',
+ 'enum.c',
+ 'expandeddatum.c',
+ 'expandedrecord.c',
+ 'float.c',
+ 'format_type.c',
+ 'formatting.c',
+ 'genfile.c',
+ 'geo_ops.c',
+ 'geo_selfuncs.c',
+ 'geo_spgist.c',
+ 'inet_cidr_ntop.c',
+ 'inet_net_pton.c',
+ 'int.c',
+ 'int8.c',
+ 'json.c',
+ 'jsonb.c',
+ 'jsonb_gin.c',
+ 'jsonb_op.c',
+ 'jsonb_util.c',
+ 'jsonfuncs.c',
+ 'jsonbsubs.c',
+ 'jsonpath.c',
+ 'jsonpath_exec.c',
+ 'like.c',
+ 'like_support.c',
+ 'lockfuncs.c',
+ 'mac.c',
+ 'mac8.c',
+ 'mcxtfuncs.c',
+ 'misc.c',
+ 'multirangetypes.c',
+ 'multirangetypes_selfuncs.c',
+ 'name.c',
+ 'network.c',
+ 'network_gist.c',
+ 'network_selfuncs.c',
+ 'network_spgist.c',
+ 'numeric.c',
+ 'numutils.c',
+ 'oid.c',
+ 'oracle_compat.c',
+ 'orderedsetaggs.c',
+ 'partitionfuncs.c',
+ 'pg_locale.c',
+ 'pg_lsn.c',
+ 'pg_upgrade_support.c',
+ 'pgstatfuncs.c',
+ 'pseudotypes.c',
+ 'quote.c',
+ 'rangetypes.c',
+ 'rangetypes_gist.c',
+ 'rangetypes_selfuncs.c',
+ 'rangetypes_spgist.c',
+ 'rangetypes_typanalyze.c',
+ 'regexp.c',
+ 'regproc.c',
+ 'ri_triggers.c',
+ 'rowtypes.c',
+ 'ruleutils.c',
+ 'selfuncs.c',
+ 'tid.c',
+ 'timestamp.c',
+ 'trigfuncs.c',
+ 'tsginidx.c',
+ 'tsgistidx.c',
+ 'tsquery.c',
+ 'tsquery_cleanup.c',
+ 'tsquery_gist.c',
+ 'tsquery_op.c',
+ 'tsquery_rewrite.c',
+ 'tsquery_util.c',
+ 'tsrank.c',
+ 'tsvector.c',
+ 'tsvector_op.c',
+ 'tsvector_parser.c',
+ 'uuid.c',
+ 'varbit.c',
+ 'varchar.c',
+ 'varlena.c',
+ 'version.c',
+ 'windowfuncs.c',
+ 'xid.c',
+ 'xid8funcs.c',
+ 'xml.c',
+)
+
+
+jsonpath_scan = custom_target('jsonpath_scan',
+ input: ['jsonpath_scan.l'],
+ output: ['jsonpath_scan.c'],
+ command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+
+# jsonpath_scan is compiled as part of jsonpath_gram
+generated_backend_sources += custom_target('jsonpath_parse',
+ input: ['jsonpath_gram.y', jsonpath_scan[0]],
+ output: ['jsonpath_gram.c'],
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
diff --git a/src/backend/utils/cache/meson.build b/src/backend/utils/cache/meson.build
new file mode 100644
index 00000000000..92972db52ad
--- /dev/null
+++ b/src/backend/utils/cache/meson.build
@@ -0,0 +1,16 @@
+backend_sources += files(
+ 'attoptcache.c',
+ 'catcache.c',
+ 'evtcache.c',
+ 'inval.c',
+ 'lsyscache.c',
+ 'partcache.c',
+ 'plancache.c',
+ 'relcache.c',
+ 'relfilenodemap.c',
+ 'relmapper.c',
+ 'spccache.c',
+ 'syscache.c',
+ 'ts_cache.c',
+ 'typcache.c',
+)
diff --git a/src/backend/utils/error/meson.build b/src/backend/utils/error/meson.build
new file mode 100644
index 00000000000..ff0ae388263
--- /dev/null
+++ b/src/backend/utils/error/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'assert.c',
+ 'elog.c',
+ )
diff --git a/src/backend/utils/fmgr/meson.build b/src/backend/utils/fmgr/meson.build
new file mode 100644
index 00000000000..e545b424fd2
--- /dev/null
+++ b/src/backend/utils/fmgr/meson.build
@@ -0,0 +1,8 @@
+backend_sources += files(
+ 'dfmgr.c',
+ 'fmgr.c',
+ 'funcapi.c',
+)
+
+# fmgrtab.c
+generated_backend_sources += fmgrtab_target[2]
diff --git a/src/backend/utils/hash/meson.build b/src/backend/utils/hash/meson.build
new file mode 100644
index 00000000000..242e2f0ecdf
--- /dev/null
+++ b/src/backend/utils/hash/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'dynahash.c',
+ 'pg_crc.c'
+)
diff --git a/src/backend/utils/init/meson.build b/src/backend/utils/init/meson.build
new file mode 100644
index 00000000000..ec9d72c3df1
--- /dev/null
+++ b/src/backend/utils/init/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'globals.c',
+ 'miscinit.c',
+ 'postinit.c')
diff --git a/src/backend/utils/mb/conversion_procs/meson.build b/src/backend/utils/mb/conversion_procs/meson.build
new file mode 100644
index 00000000000..b84a78b6318
--- /dev/null
+++ b/src/backend/utils/mb/conversion_procs/meson.build
@@ -0,0 +1,38 @@
+encodings = {
+ 'cyrillic_and_mic': ['cyrillic_and_mic/cyrillic_and_mic.c'],
+ 'euc2004_sjis2004': ['euc2004_sjis2004/euc2004_sjis2004.c'],
+ 'euc_cn_and_mic': ['euc_cn_and_mic/euc_cn_and_mic.c'],
+ 'euc_jp_and_sjis': ['euc_jp_and_sjis/euc_jp_and_sjis.c'],
+ 'euc_kr_and_mic': ['euc_kr_and_mic/euc_kr_and_mic.c'],
+ 'euc_tw_and_big5': [
+ 'euc_tw_and_big5/euc_tw_and_big5.c',
+ 'euc_tw_and_big5/big5.c',
+ ],
+ 'latin2_and_win1250': ['latin2_and_win1250/latin2_and_win1250.c'],
+ 'latin_and_mic': ['latin_and_mic/latin_and_mic.c'],
+ 'utf8_and_big5': ['utf8_and_big5/utf8_and_big5.c'],
+ 'utf8_and_cyrillic': ['utf8_and_cyrillic/utf8_and_cyrillic.c'],
+ 'utf8_and_euc2004': ['utf8_and_euc2004/utf8_and_euc2004.c'],
+ 'utf8_and_euc_cn': ['utf8_and_euc_cn/utf8_and_euc_cn.c'],
+ 'utf8_and_euc_jp': ['utf8_and_euc_jp/utf8_and_euc_jp.c'],
+ 'utf8_and_euc_kr': ['utf8_and_euc_kr/utf8_and_euc_kr.c'],
+ 'utf8_and_euc_tw': ['utf8_and_euc_tw/utf8_and_euc_tw.c'],
+ 'utf8_and_gb18030': ['utf8_and_gb18030/utf8_and_gb18030.c'],
+ 'utf8_and_gbk': ['utf8_and_gbk/utf8_and_gbk.c'],
+ 'utf8_and_iso8859': ['utf8_and_iso8859/utf8_and_iso8859.c'],
+ 'utf8_and_iso8859_1': ['utf8_and_iso8859_1/utf8_and_iso8859_1.c'],
+ 'utf8_and_johab': ['utf8_and_johab/utf8_and_johab.c'],
+ 'utf8_and_sjis': ['utf8_and_sjis/utf8_and_sjis.c'],
+ 'utf8_and_sjis2004': ['utf8_and_sjis2004/utf8_and_sjis2004.c'],
+ 'utf8_and_uhc': ['utf8_and_uhc/utf8_and_uhc.c'],
+ 'utf8_and_win': ['utf8_and_win/utf8_and_win.c'],
+}
+
+foreach encoding, sources : encodings
+ backend_targets += shared_module(encoding,
+ sources,
+ kwargs: pg_mod_args + {
+ }
+ )
+
+endforeach
diff --git a/src/backend/utils/mb/meson.build b/src/backend/utils/mb/meson.build
new file mode 100644
index 00000000000..39e45638db0
--- /dev/null
+++ b/src/backend/utils/mb/meson.build
@@ -0,0 +1,9 @@
+backend_sources += files(
+ 'conv.c',
+ 'mbutils.c',
+ 'stringinfo_mb.c',
+ 'wstrcmp.c',
+ 'wstrncmp.c',
+)
+
+# Note we only enter conversion_procs once the backend build is defined
diff --git a/src/backend/utils/meson.build b/src/backend/utils/meson.build
new file mode 100644
index 00000000000..afb1c0346ba
--- /dev/null
+++ b/src/backend/utils/meson.build
@@ -0,0 +1,13 @@
+subdir('activity')
+subdir('adt')
+subdir('cache')
+subdir('error')
+subdir('fmgr')
+subdir('hash')
+subdir('init')
+subdir('mb')
+subdir('misc')
+subdir('mmgr')
+subdir('resowner')
+subdir('sort')
+subdir('time')
diff --git a/src/backend/utils/misc/meson.build b/src/backend/utils/misc/meson.build
new file mode 100644
index 00000000000..5274c8aa1ae
--- /dev/null
+++ b/src/backend/utils/misc/meson.build
@@ -0,0 +1,28 @@
+backend_sources += files(
+ 'help_config.c',
+ 'pg_config.c',
+ 'pg_controldata.c',
+ 'pg_rusage.c',
+ 'ps_status.c',
+ 'queryenvironment.c',
+ 'queryjumble.c',
+ 'rls.c',
+ 'sampling.c',
+ 'superuser.c',
+ 'timeout.c',
+ 'tzparser.c',
+ 'guc.c',
+)
+
+# guc-file.c.h is compiled as part of guc.c
+guc_scan = custom_target('guc_scan',
+ input: ['guc-file.l'],
+ output: ['guc-file.c.h'],
+ command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+
+generated_backend_sources += guc_scan
+
+backend_build_deps += declare_dependency(sources: [guc_scan],
+ include_directories: include_directories('.'))
+
+install_data('postgresql.conf.sample', install_dir: 'share/')
diff --git a/src/backend/utils/mmgr/meson.build b/src/backend/utils/mmgr/meson.build
new file mode 100644
index 00000000000..641bb181ba1
--- /dev/null
+++ b/src/backend/utils/mmgr/meson.build
@@ -0,0 +1,10 @@
+backend_sources += files(
+ 'aset.c',
+ 'dsa.c',
+ 'freepage.c',
+ 'generation.c',
+ 'mcxt.c',
+ 'memdebug.c',
+ 'portalmem.c',
+ 'slab.c',
+)
diff --git a/src/backend/utils/mmgr/proxy.c b/src/backend/utils/mmgr/proxy.c
new file mode 100644
index 00000000000..6e68fa9a557
--- /dev/null
+++ b/src/backend/utils/mmgr/proxy.c
@@ -0,0 +1,217 @@
+#include "postgres.h"
+
+#include "utils/memdebug.h"
+#include "utils/memutils.h"
+#include "lib/ilist.h"
+
+typedef struct ProxyContext
+{
+ MemoryContextData header; /* Standard memory-context fields */
+ MemoryContext alloc_parent;
+ dlist_head allocations;
+} ProxyContext;
+
+typedef struct ProxyChunk
+{
+ dlist_node node;
+ void *context;
+} ProxyChunk;
+
+static void *ProxyContextAlloc(MemoryContext context, Size size);
+static void ProxyContextFree(MemoryContext context, void *pointer);
+static void *ProxyContextRealloc(MemoryContext context, void *pointer, Size size);
+static void ProxyContextReset(MemoryContext context);
+static void ProxyContextDelete(MemoryContext context);
+static Size ProxyContextGetChunkSpace(MemoryContext context, void *pointer);
+static bool ProxyContextIsEmpty(MemoryContext context);
+static void ProxyContextStats(MemoryContext context,
+ MemoryStatsPrintFunc printfunc, void *passthru,
+ MemoryContextCounters *totals);
+
+#ifdef MEMORY_CONTEXT_CHECKING
+static void ProxyContextCheck(MemoryContext context);
+#endif
+
+/*
+ * This is the virtual function table for ProxyContext contexts.
+ */
+static const MemoryContextMethods ProxyContextMethods = {
+ ProxyContextAlloc,
+ ProxyContextFree,
+ ProxyContextRealloc,
+ ProxyContextReset,
+ ProxyContextDelete,
+ ProxyContextGetChunkSpace,
+ ProxyContextIsEmpty,
+ ProxyContextStats
+#ifdef MEMORY_CONTEXT_CHECKING
+ ,ProxyContextCheck
+#endif
+};
+
+MemoryContext
+ProxyContextCreate(MemoryContext parent,
+ const char *name)
+{
+ ProxyContext *proxy;
+ MemoryContext alloc_parent;
+
+ proxy = (ProxyContext *) malloc(sizeof(ProxyContext));
+ if (proxy == NULL)
+ {
+ MemoryContextStats(TopMemoryContext);
+ ereport(ERROR,
+ (errcode(ERRCODE_OUT_OF_MEMORY),
+ errmsg("out of memory"),
+ errdetail("Failed while creating memory context \"%s\".",
+ name)));
+ }
+
+ /* find node we can actually allocate in */
+ alloc_parent = parent;
+ while (alloc_parent != NULL && IsA(alloc_parent, ProxyContext))
+ alloc_parent = alloc_parent->parent;
+ if (alloc_parent == NULL)
+ elog(ERROR, "can't proxy forever");
+ proxy->alloc_parent = parent;
+
+ dlist_init(&proxy->allocations);
+
+ /* Finally, do the type-independent part of context creation */
+ MemoryContextCreate((MemoryContext) proxy,
+ T_ProxyContext,
+ &ProxyContextMethods,
+ parent,
+ name);
+
+ return (MemoryContext) proxy;
+}
+
+static void *
+ProxyContextAlloc(MemoryContext context, Size size)
+{
+ ProxyContext *proxy = castNode(ProxyContext, context);
+ ProxyChunk *chunk;
+ Size alloc_size;
+
+ alloc_size = size + MAXALIGN(sizeof(ProxyChunk));
+
+ chunk = MemoryContextAlloc(proxy->alloc_parent, alloc_size);
+
+ dlist_push_tail(&proxy->allocations, &chunk->node);
+ chunk->context = context;
+
+ return (char *) chunk + MAXALIGN(sizeof(ProxyChunk));
+}
+
+static void
+ProxyContextFree(MemoryContext context, void *pointer)
+{
+ ProxyChunk *chunk = (ProxyChunk *) ((char *) pointer - MAXALIGN(sizeof(ProxyChunk)));
+
+ dlist_delete(&chunk->node);
+
+ pfree(chunk);
+}
+
+static void *
+ProxyContextRealloc(MemoryContext context, void *pointer, Size size)
+{
+ ProxyContext *proxy = castNode(ProxyContext, context);
+ ProxyChunk *chunk = (ProxyChunk *) ((char *) pointer - MAXALIGN(sizeof(ProxyChunk)));
+
+ dlist_delete(&chunk->node);
+
+ chunk =repalloc ((char *) chunk, size + MAXALIGN(sizeof(ProxyChunk)));
+
+ dlist_push_tail(&proxy->allocations, &chunk->node);
+ chunk->context = context;
+
+ return (char *) chunk + MAXALIGN(sizeof(ProxyChunk));
+}
+
+static void
+ProxyContextReset(MemoryContext context)
+{
+ ProxyContext *proxy = castNode(ProxyContext, context);
+ dlist_mutable_iter iter;
+
+ dlist_foreach_modify(iter, &proxy->allocations)
+ {
+ ProxyChunk *ptr = dlist_container(ProxyChunk, node, iter.cur);
+
+ dlist_delete(iter.cur);
+ pfree(ptr);
+ }
+}
+
+static void
+ProxyContextDelete(MemoryContext context)
+{
+ ProxyContextReset(context);
+ free(context);
+}
+
+static Size
+ProxyContextGetChunkSpace(MemoryContext context, void *pointer)
+{
+ ProxyChunk *chunk = (ProxyChunk *) ((char *) pointer - MAXALIGN(sizeof(ProxyChunk)));
+
+ return GetMemoryChunkSpace(chunk);
+}
+
+static bool
+ProxyContextIsEmpty(MemoryContext context)
+{
+ ProxyContext *proxy = castNode(ProxyContext, context);
+
+ return dlist_is_empty(&proxy->allocations);
+}
+
+static void
+ProxyContextStats(MemoryContext context,
+ MemoryStatsPrintFunc printfunc, void *passthru,
+ MemoryContextCounters *totals)
+{
+ ProxyContext *proxy = castNode(ProxyContext, context);
+ Size nblocks = 0;
+ Size freechunks = 0;
+ Size totalspace = 0;
+ Size freespace = 0;
+ Size chunks = 0;
+ dlist_iter iter;
+
+ dlist_foreach(iter, &proxy->allocations)
+ {
+ ProxyChunk *chunk = dlist_container(ProxyChunk, node, iter.cur);
+
+ totalspace += GetMemoryChunkSpace((void *) chunk);
+ chunks++;
+ }
+
+ if (printfunc)
+ {
+ char stats_string[200];
+
+ snprintf(stats_string, sizeof(stats_string),
+ "%zu chunks proxied to parent, totaling %zu bytes",
+ chunks, totalspace);
+ printfunc(context, passthru, stats_string);
+ }
+
+ if (totals)
+ {
+ totals->nblocks += nblocks;
+ totals->freechunks += freechunks;
+ totals->totalspace += totalspace;
+ totals->freespace += freespace;
+ }
+}
+
+#ifdef MEMORY_CONTEXT_CHECKING
+static void
+ProxyContextCheck(MemoryContext context)
+{
+ /* FIXME */
+}
+#endif
diff --git a/src/backend/utils/resowner/meson.build b/src/backend/utils/resowner/meson.build
new file mode 100644
index 00000000000..d30891ca027
--- /dev/null
+++ b/src/backend/utils/resowner/meson.build
@@ -0,0 +1,3 @@
+backend_sources += files(
+ 'resowner.c'
+)
diff --git a/src/backend/utils/sort/meson.build b/src/backend/utils/sort/meson.build
new file mode 100644
index 00000000000..b626bdc9d96
--- /dev/null
+++ b/src/backend/utils/sort/meson.build
@@ -0,0 +1,7 @@
+backend_sources += files(
+ 'logtape.c',
+ 'sharedtuplestore.c',
+ 'sortsupport.c',
+ 'tuplesort.c',
+ 'tuplestore.c',
+)
diff --git a/src/backend/utils/time/meson.build b/src/backend/utils/time/meson.build
new file mode 100644
index 00000000000..6fff8792bb0
--- /dev/null
+++ b/src/backend/utils/time/meson.build
@@ -0,0 +1,4 @@
+backend_sources += files(
+ 'combocid.c',
+ 'snapmgr.c',
+)
diff --git a/src/bin/initdb/meson.build b/src/bin/initdb/meson.build
new file mode 100644
index 00000000000..52f679e3116
--- /dev/null
+++ b/src/bin/initdb/meson.build
@@ -0,0 +1,24 @@
+initdb_sources = files(
+ 'findtimezone.c',
+ 'initdb.c'
+)
+
+initdb_sources += timezone_localtime_source
+
+#fixme: reimplement libpq_pgport logic
+
+executable('initdb',
+ initdb_sources,
+ include_directories: [timezone_inc],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'initdb',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_initdb.pl'
+ ]
+}
diff --git a/src/bin/meson.build b/src/bin/meson.build
new file mode 100644
index 00000000000..3718fd0759a
--- /dev/null
+++ b/src/bin/meson.build
@@ -0,0 +1,20 @@
+subdir('initdb')
+subdir('pg_amcheck')
+subdir('pg_archivecleanup')
+subdir('pg_basebackup')
+subdir('pg_checksums')
+subdir('pg_config')
+subdir('pg_controldata')
+subdir('pg_ctl')
+subdir('pg_dump')
+subdir('pg_resetwal')
+subdir('pg_rewind')
+subdir('pg_test_fsync')
+subdir('pg_test_timing')
+subdir('pg_upgrade')
+subdir('pg_verifybackup')
+subdir('pg_waldump')
+subdir('pgbench')
+#TODO subdir('pgevent')
+subdir('psql')
+subdir('scripts')
diff --git a/src/bin/pg_amcheck/meson.build b/src/bin/pg_amcheck/meson.build
new file mode 100644
index 00000000000..69eaef8f141
--- /dev/null
+++ b/src/bin/pg_amcheck/meson.build
@@ -0,0 +1,22 @@
+pg_amcheck_sources = files(
+ 'pg_amcheck.c'
+)
+
+pg_amcheck = executable('pg_amcheck',
+ pg_amcheck_sources,
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_amcheck',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_nonesuch.pl',
+ 't/003_check.pl',
+ 't/004_verify_heapam.pl',
+ 't/005_opclass_damage.pl',
+ ]
+}
diff --git a/src/bin/pg_archivecleanup/meson.build b/src/bin/pg_archivecleanup/meson.build
new file mode 100644
index 00000000000..27742fafab7
--- /dev/null
+++ b/src/bin/pg_archivecleanup/meson.build
@@ -0,0 +1,14 @@
+pg_archivecleanup = executable('pg_archivecleanup',
+ ['pg_archivecleanup.c'],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_archivecleanup',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/010_pg_archivecleanup.pl'
+ ]
+}
diff --git a/src/bin/pg_basebackup/meson.build b/src/bin/pg_basebackup/meson.build
new file mode 100644
index 00000000000..a629b8b02f5
--- /dev/null
+++ b/src/bin/pg_basebackup/meson.build
@@ -0,0 +1,44 @@
+common_sources = files(
+ 'receivelog.c',
+ 'streamutil.c',
+ 'walmethods.c',
+)
+
+pg_basebackup_common = static_library('pg_basebackup_common',
+ common_sources,
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: internal_lib_args,
+)
+
+executable('pg_basebackup',
+ 'pg_basebackup.c',
+ link_with: [pg_basebackup_common],
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: default_bin_args,
+)
+
+executable('pg_receivewal',
+ 'pg_receivewal.c',
+ link_with: [pg_basebackup_common],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+executable('pg_recvlogical',
+ 'pg_recvlogical.c',
+ link_with: [pg_basebackup_common],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name' : 'pg_basebackup',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'env': {'GZIP_PROGRAM': gzip.path(), 'TAR': tar.path()},
+ 'tests': [
+ 't/010_pg_basebackup.pl',
+ 't/020_pg_receivewal.pl',
+ 't/030_pg_recvlogical.pl',
+ ]
+}
diff --git a/src/bin/pg_checksums/meson.build b/src/bin/pg_checksums/meson.build
new file mode 100644
index 00000000000..bbf9582b904
--- /dev/null
+++ b/src/bin/pg_checksums/meson.build
@@ -0,0 +1,16 @@
+executable('pg_checksums',
+ ['pg_checksums.c'],
+ include_directories: [timezone_inc],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_checksums',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_actions.pl'
+ ]
+}
diff --git a/src/bin/pg_config/meson.build b/src/bin/pg_config/meson.build
new file mode 100644
index 00000000000..df0eb13f636
--- /dev/null
+++ b/src/bin/pg_config/meson.build
@@ -0,0 +1,14 @@
+executable('pg_config',
+ ['pg_config.c'],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_config',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_pg_config.pl',
+ ]
+}
diff --git a/src/bin/pg_controldata/meson.build b/src/bin/pg_controldata/meson.build
new file mode 100644
index 00000000000..fa6057afa54
--- /dev/null
+++ b/src/bin/pg_controldata/meson.build
@@ -0,0 +1,14 @@
+executable('pg_controldata',
+ ['pg_controldata.c'],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_controldata',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_pg_controldata.pl'
+ ]
+}
diff --git a/src/bin/pg_ctl/meson.build b/src/bin/pg_ctl/meson.build
new file mode 100644
index 00000000000..ac0d4f18192
--- /dev/null
+++ b/src/bin/pg_ctl/meson.build
@@ -0,0 +1,17 @@
+executable('pg_ctl',
+ ['pg_ctl.c'],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_ctl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_start_stop.pl',
+ 't/002_status.pl',
+ 't/003_promote.pl',
+ 't/004_logrotate.pl'
+ ]
+}
diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build
new file mode 100644
index 00000000000..ce5ef11eaeb
--- /dev/null
+++ b/src/bin/pg_dump/meson.build
@@ -0,0 +1,69 @@
+pg_dump_common_sources = files(
+ 'compress_io.c',
+ 'dumputils.c',
+ 'parallel.c',
+ 'pg_backup_archiver.c',
+ 'pg_backup_custom.c',
+ 'pg_backup_db.c',
+ 'pg_backup_directory.c',
+ 'pg_backup_null.c',
+ 'pg_backup_tar.c',
+ 'pg_backup_utils.c',
+)
+
+pg_dump_common = static_library('pg_dump_common',
+ pg_dump_common_sources,
+ c_pch: '../../include/pch/c_pch.h',
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: internal_lib_args,
+)
+
+pg_dump_sources = files(
+ 'pg_dump.c',
+ 'common.c',
+ 'pg_dump_sort.c',
+)
+
+executable('pg_dump',
+ pg_dump_sources,
+ link_with: [pg_dump_common],
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: default_bin_args,
+)
+
+
+pg_dumpall_sources = files(
+ 'pg_dumpall.c',
+)
+
+executable('pg_dumpall',
+ pg_dumpall_sources,
+ link_with: [pg_dump_common],
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: default_bin_args,
+)
+
+
+pg_restore_sources = files(
+ 'pg_restore.c',
+)
+
+executable('pg_restore',
+ pg_restore_sources,
+ link_with: [pg_dump_common],
+ dependencies: [frontend_code, libpq, zlib],
+ kwargs: default_bin_args,
+)
+
+
+tap_tests += {
+ 'name': 'pg_dump',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_pg_dump.pl',
+ 't/003_pg_dump_with_server.pl',
+ 't/010_dump_connstr.pl',
+ ]
+}
diff --git a/src/bin/pg_resetwal/meson.build b/src/bin/pg_resetwal/meson.build
new file mode 100644
index 00000000000..7450c0f6432
--- /dev/null
+++ b/src/bin/pg_resetwal/meson.build
@@ -0,0 +1,15 @@
+executable('pg_resetwal',
+ files('pg_resetwal.c'),
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_resetwal',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_corrupted.pl'
+ ]
+}
diff --git a/src/bin/pg_rewind/meson.build b/src/bin/pg_rewind/meson.build
new file mode 100644
index 00000000000..c7c59e9e523
--- /dev/null
+++ b/src/bin/pg_rewind/meson.build
@@ -0,0 +1,34 @@
+pg_rewind_sources = files(
+ 'datapagemap.c',
+ 'file_ops.c',
+ 'filemap.c',
+ 'libpq_source.c',
+ 'local_source.c',
+ 'parsexlog.c',
+ 'pg_rewind.c',
+ 'timeline.c',
+ '../../backend/access/transam/xlogreader.c',
+)
+
+pg_rewind = executable('pg_rewind',
+ pg_rewind_sources,
+ dependencies: [frontend_code, libpq, lz4],
+ kwargs: default_bin_args,
+)
+
+
+tap_tests += {
+ 'name': 'pg_rewind',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_databases.pl',
+ 't/003_extrafiles.pl',
+ 't/004_pg_xlog_symlink.pl',
+ 't/005_same_timeline.pl',
+ 't/006_options.pl',
+ 't/007_standby_source.pl',
+ 't/008_min_recovery_point.pl',
+ ]
+}
diff --git a/src/bin/pg_test_fsync/meson.build b/src/bin/pg_test_fsync/meson.build
new file mode 100644
index 00000000000..527be88d125
--- /dev/null
+++ b/src/bin/pg_test_fsync/meson.build
@@ -0,0 +1,14 @@
+executable('pg_test_fsync',
+ ['pg_test_fsync.c'],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name' : 'pg_test_fsync',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests' :[
+ 't/001_basic.pl',
+ ]
+}
diff --git a/src/bin/pg_test_timing/meson.build b/src/bin/pg_test_timing/meson.build
new file mode 100644
index 00000000000..c74577df493
--- /dev/null
+++ b/src/bin/pg_test_timing/meson.build
@@ -0,0 +1,14 @@
+pg_test_timing = executable('pg_test_timing',
+ ['pg_test_timing.c'],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_test_timing',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl'
+ ]
+}
diff --git a/src/bin/pg_upgrade/meson.build b/src/bin/pg_upgrade/meson.build
new file mode 100644
index 00000000000..88d0e03446b
--- /dev/null
+++ b/src/bin/pg_upgrade/meson.build
@@ -0,0 +1,26 @@
+pg_upgrade_sources = files(
+ 'check.c',
+ 'controldata.c',
+ 'dump.c',
+ 'exec.c',
+ 'file.c',
+ 'function.c',
+ 'info.c',
+ 'option.c',
+ 'parallel.c',
+ 'pg_upgrade.c',
+ 'relfilenode.c',
+ 'server.c',
+ 'tablespace.c',
+ 'util.c',
+ 'version.c',
+)
+
+pg_upgrade = executable('pg_upgrade',
+ pg_upgrade_sources,
+ c_pch: '../../include/pch/c_pch.h',
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+# FIXME: add test
diff --git a/src/bin/pg_verifybackup/meson.build b/src/bin/pg_verifybackup/meson.build
new file mode 100644
index 00000000000..c7039ddcc49
--- /dev/null
+++ b/src/bin/pg_verifybackup/meson.build
@@ -0,0 +1,25 @@
+pg_verifybackup_sources = files(
+ 'parse_manifest.c',
+ 'pg_verifybackup.c'
+)
+
+pg_verifybackup = executable('pg_verifybackup',
+ pg_verifybackup_sources,
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_verifybackup',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ 't/002_algorithm.pl',
+ 't/003_corruption.pl',
+ 't/004_options.pl',
+ 't/005_bad_manifest.pl',
+ 't/006_encoding.pl',
+ 't/007_wal.pl',
+ ]
+}
diff --git a/src/bin/pg_waldump/meson.build b/src/bin/pg_waldump/meson.build
new file mode 100644
index 00000000000..f89139f89f5
--- /dev/null
+++ b/src/bin/pg_waldump/meson.build
@@ -0,0 +1,23 @@
+pg_waldump_sources = files(
+ 'compat.c',
+ 'pg_waldump.c',
+ 'rmgrdesc.c',
+)
+
+pg_waldump_sources += rmgr_desc_sources
+pg_waldump_sources += xlogreader_sources
+
+pg_waldump = executable('pg_waldump',
+ pg_waldump_sources,
+ dependencies: [frontend_code, lz4],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'pg_waldump',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_basic.pl',
+ ]
+}
diff --git a/src/bin/pgbench/meson.build b/src/bin/pgbench/meson.build
new file mode 100644
index 00000000000..5c4a778ff32
--- /dev/null
+++ b/src/bin/pgbench/meson.build
@@ -0,0 +1,38 @@
+pgbench_sources = files(
+ 'pgbench.c',
+)
+
+# exprscan is compiled as part ofexprparse. The ordering is enforced by making
+# the generation of grammar depend on the scanner generation. That's
+# unnecessarily strict, but overall harmless.
+
+exprscan = custom_target('exprscan',
+ input : files('exprscan.l'),
+ output : ['exprscan.c'],
+ command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+)
+
+exprparse = custom_target('exprparse',
+ input: 'exprparse.y',
+ output: 'exprparse.c',
+ depends: exprscan,
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
+pgbench_sources += exprparse
+
+executable('pgbench',
+ pgbench_sources,
+ dependencies: [frontend_code, libpq, thread_dep],
+ include_directories: include_directories('.'),
+ kwargs: default_bin_args,
+)
+
+
+tap_tests += {
+ 'name' : 'pgbench',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests' :[
+ 't/001_pgbench_with_server.pl',
+ 't/002_pgbench_no_server.pl'
+ ]
+}
diff --git a/src/bin/pgevent/meson.build b/src/bin/pgevent/meson.build
new file mode 100644
index 00000000000..9b4642a69d0
--- /dev/null
+++ b/src/bin/pgevent/meson.build
@@ -0,0 +1 @@
+# FIXME: implement when I can test
diff --git a/src/bin/psql/meson.build b/src/bin/psql/meson.build
new file mode 100644
index 00000000000..98921f801d7
--- /dev/null
+++ b/src/bin/psql/meson.build
@@ -0,0 +1,46 @@
+psql_sources = files(
+ 'command.c',
+ 'common.c',
+ 'copy.c',
+ 'crosstabview.c',
+ 'describe.c',
+ 'help.c',
+ 'input.c',
+ 'large_obj.c',
+ 'mainloop.c',
+ 'prompt.c',
+ 'startup.c',
+ 'stringutils.c',
+ 'tab-complete.c',
+ 'variables.c',
+)
+
+psql_sources += custom_target('psqlscanslash',
+ input: ['psqlscanslash.l'],
+ output: ['psqlscanslash.c'],
+ command: [flex, '-CFe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+
+psql_sources += custom_target('psql_help',
+ input: ['create_help.pl'],
+ output: ['sql_help.c', 'sql_help.h'],
+ depfile: 'sql_help.dep',
+ command: [perl, '@INPUT0@', '@SOURCE_ROOT@/doc/src/sgml/ref', '@OUTDIR@', 'sql_help'])
+
+executable('psql',
+ psql_sources,
+ c_pch: '../../include/pch/c_pch.h',
+ include_directories: include_directories('.'),
+ dependencies : [frontend_code, libpq, readline],
+ kwargs: default_bin_args,
+)
+
+tap_tests += {
+ 'name': 'psql',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'env': {'with_readline': readline.found() ? 'yes' : 'no'},
+ 'tests': [
+ 't/010_tab_completion.pl',
+ 't/020_cancel.pl',
+ ],
+}
diff --git a/src/bin/scripts/meson.build b/src/bin/scripts/meson.build
new file mode 100644
index 00000000000..547a53500a4
--- /dev/null
+++ b/src/bin/scripts/meson.build
@@ -0,0 +1,46 @@
+scripts_common = static_library('scripts_common',
+ files('common.c'),
+ dependencies: [frontend_code, libpq],
+ kwargs: internal_lib_args,
+)
+
+binaries = [
+ 'createdb',
+ 'dropdb',
+ 'createuser',
+ 'dropuser',
+ 'clusterdb',
+ 'vacuumdb',
+ 'reindexdb',
+ 'pg_isready',
+]
+
+foreach binary : binaries
+ executable(binary,
+ files(binary + '.c'),
+ link_with: [scripts_common],
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args,
+ )
+endforeach
+
+tap_tests += {
+ 'name': 'scripts',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/010_clusterdb.pl',
+ 't/011_clusterdb_all.pl',
+ 't/020_createdb.pl',
+ 't/040_createuser.pl',
+ 't/050_dropdb.pl',
+ 't/070_dropuser.pl',
+ 't/080_pg_isready.pl',
+ 't/090_reindexdb.pl',
+ 't/091_reindexdb_all.pl',
+ 't/100_vacuumdb.pl',
+ 't/101_vacuumdb_all.pl',
+ 't/102_vacuumdb_stages.pl',
+ 't/200_connstr.pl',
+ ]
+}
diff --git a/src/common/meson.build b/src/common/meson.build
new file mode 100644
index 00000000000..6be70b0c5b3
--- /dev/null
+++ b/src/common/meson.build
@@ -0,0 +1,140 @@
+common_sources = files(
+ 'archive.c',
+ 'base64.c',
+ 'checksum_helper.c',
+ 'config_info.c',
+ 'controldata_utils.c',
+ 'encnames.c',
+ 'exec.c',
+ 'file_perm.c',
+ 'file_utils.c',
+ 'hashfn.c',
+ 'ip.c',
+ 'jsonapi.c',
+ 'keywords.c',
+ 'kwlookup.c',
+ 'link-canary.c',
+ 'md5_common.c',
+ 'pg_get_line.c',
+ 'pg_lzcompress.c',
+ 'pgfnames.c',
+ 'psprintf.c',
+ 'relpath.c',
+ 'rmtree.c',
+ 'saslprep.c',
+ 'scram-common.c',
+ 'string.c',
+ 'stringinfo.c',
+ 'unicode_norm.c',
+ 'username.c',
+ 'wait_error.c',
+ 'wchar.c',
+)
+
+# FIXME: implement openssl
+if ssl.found()
+ common_sources += files(
+ 'cryptohash_openssl.c',
+ 'hmac_openssl.c',
+ 'protocol_openssl.c',
+ )
+else
+ common_sources += files(
+ 'cryptohash.c',
+ 'hmac.c',
+ 'md5.c',
+ 'sha1.c',
+ 'sha2.c',
+ )
+endif
+
+common_sources += custom_target('kwlist',
+ input: files('../include/parser/kwlist.h'),
+ output: 'kwlist_d.h',
+ command: [perl, '-I', '@SOURCE_ROOT@/src/tools', files('../tools/gen_keywordlist.pl'),
+ '--extern', '--output', '@OUTDIR@', '@INPUT@'])
+
+
+# The code imported from Ryu gets a pass on declaration-after-statement,
+# in order to keep it more closely aligned with its upstream.
+ryu_sources = files(
+ 'd2s.c',
+ 'f2s.c',
+)
+ryu_cflags = []
+
+if using_declaration_after_statement_warning
+ ryu_cflags += ['-Wno-declaration-after-statement']
+endif
+
+ryu_srv = static_library('ryu_srv',
+ ryu_sources,
+ dependencies: [backend_port_code],
+ c_args: ryu_cflags,
+ kwargs: internal_lib_args
+)
+
+ryu_shlib = static_library('ryu_shlib',
+ ryu_sources,
+ dependencies: [frontend_port_code],
+ c_args: ryu_cflags,
+ pic: true,
+ kwargs: internal_lib_args
+)
+
+ryu_static = static_library('ryu_static',
+ ryu_sources,
+ dependencies: [frontend_port_code],
+ c_args: ryu_cflags,
+ kwargs: internal_lib_args
+)
+
+
+# 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,
+# because it is not appropriate for general purpose libraries such
+# as libpq to report errors directly.
+
+common_sources_frontend_shlib = common_sources
+common_sources_frontend_shlib += files(
+ 'fe_memutils.c',
+ 'restricted_token.c',
+ 'sprompt.c',
+)
+
+common_sources_frontend_static = common_sources_frontend_shlib
+common_sources_frontend_static += files(
+ 'logging.c',
+)
+
+# XXX: in most environments we could probably link_whole pgcommon_shlib
+# against pgcommon_static, instead of compiling twice.
+
+common_srv = static_library('pgcommon_srv',
+ common_sources,
+ c_pch: '../include/pch/c_pch.h',
+ link_with: [ryu_srv],
+ dependencies: [backend_common_code, ssl],
+ include_directories: include_directories('.'),
+ kwargs: internal_lib_args,
+)
+
+common_shlib = static_library('pgcommon_shlib',
+ common_sources_frontend_shlib,
+ c_pch: '../include/pch/c_pch.h',
+ pic: true,
+ link_with: [ryu_shlib],
+ dependencies: [frontend_common_code, ssl],
+ include_directories: include_directories('.'),
+ kwargs: default_lib_args,
+)
+
+common_static = static_library('pgcommon_static',
+ common_sources_frontend_static,
+ c_pch: '../include/pch/c_pch.h',
+ link_with: [ryu_static],
+ dependencies: [frontend_common_code, ssl],
+ include_directories: include_directories('.'),
+ kwargs: default_lib_args,
+)
diff --git a/src/fe_utils/meson.build b/src/fe_utils/meson.build
new file mode 100644
index 00000000000..b305727d967
--- /dev/null
+++ b/src/fe_utils/meson.build
@@ -0,0 +1,27 @@
+fe_utils_sources = files(
+ 'archive.c',
+ 'cancel.c',
+ 'conditional.c',
+ 'connect_utils.c',
+ 'mbprint.c',
+ 'option_utils.c',
+ 'parallel_slot.c',
+ 'print.c',
+ 'query_utils.c',
+ 'recovery_gen.c',
+ 'simple_list.c',
+ 'string_utils.c',
+)
+
+fe_utils_sources += custom_target('psqlscan',
+ input: ['psqlscan.l'],
+ output: ['psqlscan.c'],
+ command: [flex, '-Cfe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+
+fe_utils = static_library('fe_utils',
+ fe_utils_sources + generated_headers,
+ c_pch: '../include/pch/c_pch.h',
+ include_directories : [postgres_inc, libpq_inc],
+ c_args: ['-DFRONTEND'],
+ kwargs: default_lib_args,
+)
diff --git a/src/include/catalog/meson.build b/src/include/catalog/meson.build
new file mode 100644
index 00000000000..a86ac67eada
--- /dev/null
+++ b/src/include/catalog/meson.build
@@ -0,0 +1,113 @@
+catalog_headers = [
+ 'pg_proc.h',
+ 'pg_type.h',
+ 'pg_attribute.h',
+ 'pg_class.h',
+ 'pg_attrdef.h',
+ 'pg_constraint.h',
+ 'pg_inherits.h',
+ 'pg_index.h',
+ 'pg_operator.h',
+ 'pg_opfamily.h',
+ 'pg_opclass.h',
+ 'pg_am.h',
+ 'pg_amop.h',
+ 'pg_amproc.h',
+ 'pg_language.h',
+ 'pg_largeobject_metadata.h',
+ 'pg_largeobject.h',
+ 'pg_aggregate.h',
+ 'pg_statistic.h',
+ 'pg_statistic_ext.h',
+ 'pg_statistic_ext_data.h',
+ 'pg_rewrite.h',
+ 'pg_trigger.h',
+ 'pg_event_trigger.h',
+ 'pg_description.h',
+ 'pg_cast.h',
+ 'pg_enum.h',
+ 'pg_namespace.h',
+ 'pg_conversion.h',
+ 'pg_depend.h',
+ 'pg_database.h',
+ 'pg_db_role_setting.h',
+ 'pg_tablespace.h',
+ 'pg_authid.h',
+ 'pg_auth_members.h',
+ 'pg_shdepend.h',
+ 'pg_shdescription.h',
+ 'pg_ts_config.h',
+ 'pg_ts_config_map.h',
+ 'pg_ts_dict.h',
+ 'pg_ts_parser.h',
+ 'pg_ts_template.h',
+ 'pg_extension.h',
+ 'pg_foreign_data_wrapper.h',
+ 'pg_foreign_server.h',
+ 'pg_user_mapping.h',
+ 'pg_foreign_table.h',
+ 'pg_policy.h',
+ 'pg_replication_origin.h',
+ 'pg_default_acl.h',
+ 'pg_init_privs.h',
+ 'pg_seclabel.h',
+ 'pg_shseclabel.h',
+ 'pg_collation.h',
+ 'pg_partitioned_table.h',
+ 'pg_range.h',
+ 'pg_transform.h',
+ 'pg_sequence.h',
+ 'pg_publication.h',
+ 'pg_publication_rel.h',
+ 'pg_subscription.h',
+ 'pg_subscription_rel.h',
+]
+
+bki_data = files(
+ 'pg_aggregate.dat',
+ 'pg_am.dat',
+ 'pg_amop.dat',
+ 'pg_amproc.dat',
+ 'pg_authid.dat',
+ 'pg_cast.dat',
+ 'pg_class.dat',
+ 'pg_collation.dat',
+ 'pg_conversion.dat',
+ 'pg_database.dat',
+ 'pg_language.dat',
+ 'pg_namespace.dat',
+ 'pg_opclass.dat',
+ 'pg_operator.dat',
+ 'pg_opfamily.dat',
+ 'pg_proc.dat',
+ 'pg_range.dat',
+ 'pg_tablespace.dat',
+ 'pg_ts_config.dat',
+ 'pg_ts_config_map.dat',
+ 'pg_ts_dict.dat',
+ 'pg_ts_parser.dat',
+ 'pg_ts_template.dat',
+ 'pg_type.dat',
+ )
+
+
+input = []
+output_files = ['postgres.bki', 'schemapg.h', 'system_fk_info.h', 'system_constraints.sql']
+output_install = [get_option('datadir'), get_option('includedir'), get_option('includedir'), get_option('datadir')]
+
+foreach h : catalog_headers
+ fname = h.split('.h')[0]+'_d.h'
+ input += files(h)
+ output_files += fname
+ output_install += get_option('includedir')
+endforeach
+
+generated_headers += custom_target('generated_catalog_headers',
+ input: input,
+ depend_files: bki_data,
+ build_by_default: true,
+ install: true,
+ output: output_files,
+ install_dir: output_install,
+ command: [perl, files('../../backend/catalog/genbki.pl'), '--include-path=@SOURCE_ROOT@/src/include', '--set-version='+pg_version_major.to_string(), '--output=@OUTDIR@', '@INPUT@']
+ )
diff --git a/src/include/meson.build b/src/include/meson.build
new file mode 100644
index 00000000000..c3af4a2574f
--- /dev/null
+++ b/src/include/meson.build
@@ -0,0 +1,50 @@
+configure_file(input : 'pg_config_ext.h.meson',
+ output : 'pg_config_ext.h',
+ configuration : cdata)
+
+system = host_machine.system()
+if system == 'windows'
+ system = 'win32'
+endif
+
+configure_file(
+ output : 'pg_config_os.h',
+ input: files('port/@0@.h'.format(system)),
+ install: true,
+ install_dir : get_option('includedir'),
+ copy : true)
+
+configure_file(
+ output : 'pg_config.h',
+ install : true,
+ install_dir : get_option('includedir'),
+ configuration : cdata)
+
+
+config_paths_data = configuration_data()
+config_paths_data.set_quoted('PGBINDIR', get_option('prefix') / get_option('bindir'))
+config_paths_data.set_quoted('PGSHAREDIR', get_option('prefix') / get_option('datadir'))
+config_paths_data.set_quoted('SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
+config_paths_data.set_quoted('INCLUDEDIR', get_option('prefix') / get_option('includedir'))
+# FIXME: shouldn't be the same
+config_paths_data.set_quoted('PKGINCLUDEDIR', get_option('prefix') / get_option('includedir'))
+config_paths_data.set_quoted('INCLUDEDIRSERVER', get_option('prefix') / get_option('includedir'))
+config_paths_data.set_quoted('LIBDIR', get_option('prefix') / get_option('libdir'))
+# FIXME: figure out logic for pkglibdir
+config_paths_data.set_quoted('PKGLIBDIR', get_option('prefix') / get_option('libdir'))
+config_paths_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+config_paths_data.set_quoted('DOCDIR', get_option('prefix') / get_option('datadir') / 'doc/postgresql')
+config_paths_data.set_quoted('HTMLDIR', get_option('prefix') / get_option('datadir') / 'doc/postgresql')
+config_paths_data.set_quoted('MANDIR', get_option('prefix') / get_option('datadir') / 'doc/postgresql')
+
+configure_file(
+ output: 'pg_config_paths.h',
+ configuration: config_paths_data,
+ install: false
+)
+
+
+subdir('utils')
+subdir('storage')
+subdir('catalog')
+subdir('parser')
diff --git a/src/include/parser/meson.build b/src/include/parser/meson.build
new file mode 100644
index 00000000000..caf4c092909
--- /dev/null
+++ b/src/include/parser/meson.build
@@ -0,0 +1,10 @@
+backend_parser_header = custom_target('gram',
+ input: [files('../../backend/parser/gram.y')],
+ output: ['gram.c', 'gram.h'],
+ command: [bison, bisonflags, '-d', '-o', '@OUTPUT0@', '@INPUT0@'],
+ install: true,
+ # Only install gram.h, not gram.c
+ install_dir: [false, get_option('includedir')]
+)
+
+#generated_backend_headers += backend_parser[1]
diff --git a/src/include/pch/c_pch.h b/src/include/pch/c_pch.h
new file mode 100644
index 00000000000..f40c757ca62
--- /dev/null
+++ b/src/include/pch/c_pch.h
@@ -0,0 +1 @@
+#include "c.h"
diff --git a/src/include/pch/postgres_pch.h b/src/include/pch/postgres_pch.h
new file mode 100644
index 00000000000..71b2f35f76b
--- /dev/null
+++ b/src/include/pch/postgres_pch.h
@@ -0,0 +1 @@
+#include "postgres.h"
diff --git a/src/include/pg_config_ext.h.meson b/src/include/pg_config_ext.h.meson
new file mode 100644
index 00000000000..57cdfca0cfd
--- /dev/null
+++ b/src/include/pg_config_ext.h.meson
@@ -0,0 +1,7 @@
+/*
+ * src/include/pg_config_ext.h.in. This is generated manually, not by
+ * autoheader, since we want to limit which symbols get defined here.
+ */
+
+/* Define to the name of a signed 64-bit integer type. */
+#mesondefine PG_INT64_TYPE
diff --git a/src/include/storage/meson.build b/src/include/storage/meson.build
new file mode 100644
index 00000000000..ce749169442
--- /dev/null
+++ b/src/include/storage/meson.build
@@ -0,0 +1,15 @@
+# FIXME: this creates an unnecessary lwlocknames.c - but it's not
+# obvious how to avoid that: meson insist on output files being in the
+# current dir.
+
+# FIXME: this leads to lwlocknames.c being installed. Bad.
+lwlocknames = custom_target('lwlocknames',
+ input : files('../../backend/storage/lmgr/lwlocknames.txt'),
+ output : ['lwlocknames.h', 'lwlocknames.c'],
+ command : [perl, files('../../backend/storage/lmgr/generate-lwlocknames.pl'), '-o', '@OUTDIR@', '@INPUT@'],
+ build_by_default: true,
+ install: true,
+ install_dir: get_option('includedir')
+)
+
+generated_backend_headers += lwlocknames[0]
diff --git a/src/include/utils/meson.build b/src/include/utils/meson.build
new file mode 100644
index 00000000000..b9c959b474d
--- /dev/null
+++ b/src/include/utils/meson.build
@@ -0,0 +1,22 @@
+errcodes = custom_target('errcodes',
+ input : files('../../backend/utils/errcodes.txt'),
+ output : ['errcodes.h'],
+ command : [perl, files('../../backend/utils/generate-errcodes.pl'), '@INPUT@', '@OUTPUT@']
+)
+generated_headers += errcodes
+
+generated_backend_headers += custom_target('probes.d',
+ input: files('../../backend/utils/probes.d'),
+ output : 'probes.h',
+ capture: true,
+ command : [sed, '-f', files('../../backend/utils/Gen_dummy_probes.sed'), '@INPUT@']
+)
+
+fmgrtab_target = custom_target('fmgrtab',
+ input: '../catalog/pg_proc.dat',
+ output : ['fmgroids.h', 'fmgrprotos.h', 'fmgrtab.c'],
+ command: [perl, '-I', '@SOURCE_ROOT@/src/backend/catalog/', files('../../backend/utils/Gen_fmgrtab.pl'), '--include-path=@SOURCE_ROOT@/src/include', '--output=@OUTDIR@', '@INPUT@']
+)
+
+generated_backend_headers += fmgrtab_target[0]
+generated_backend_headers += fmgrtab_target[1]
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build
new file mode 100644
index 00000000000..4b716f0e89d
--- /dev/null
+++ b/src/interfaces/libpq/meson.build
@@ -0,0 +1,99 @@
+libpq_sources = files(
+ 'fe-auth-scram.c',
+ 'fe-connect.c',
+ 'fe-exec.c',
+ 'fe-lobj.c',
+ 'fe-misc.c',
+ 'fe-print.c',
+ 'fe-protocol3.c',
+ 'fe-secure.c',
+ 'fe-trace.c',
+ 'legacy-pqsignal.c',
+ 'libpq-events.c',
+ 'pqexpbuffer.c',
+ 'fe-auth.c',
+)
+
+if host_machine.system() == 'windows'
+ libpq_sources += files('win32.c', 'pthread-win32.c')
+endif
+
+if ssl.found()
+ libpq_sources += files('fe-secure-common.c')
+ libpq_sources += files('fe-secure-openssl.c')
+endif
+
+if gssapi.found()
+ libpq_sources += files(
+ 'fe-secure-gssapi.c',
+ 'fe-gssapi-common.c'
+ )
+endif
+
+export_file = custom_target('libpq_exports.list',
+ input: [files('exports.txt')],
+ output: ['@BASENAME@.list'],
+ command: [perl, files('../../tools/gen_versioning_script.pl'),
+ host_machine.system() == 'darwin' ? 'darwin' : 'gnu',
+ '@INPUT0@', '@OUTPUT0@'],
+ build_by_default: false,
+ install: false,
+)
+
+libpq_def = custom_target('libpq.def',
+ command: [perl, files('../../tools/msvc/export2def.pl'), '@OUTPUT@', '@INPUT0@', 'libpq'],
+ input: files('exports.txt'),
+ output: 'libpq.def',
+ build_by_default: false,
+ install: false,
+)
+
+# port needs to be in include path due to pthread-win32.h
+libpq_inc = include_directories('.', '../../port')
+libpq_deps = [frontend_shlib_code, thread_dep, ssl, ldap, gssapi]
+libpq_link_depends = []
+
+libpq_kwargs = default_lib_args + {
+ 'version': '5.'+pg_version_major.to_string(),
+}
+
+
+if host_machine.system() == 'darwin'
+ libpq_kwargs = libpq_kwargs + {
+ 'link_args': ['-exported_symbols_list', export_file.full_path()],
+ 'link_depends': export_file,
+ 'soversion': '5',
+ }
+elif host_machine.system() == 'windows'
+ libpq_deps += cc.find_library('secur32', required: true)
+
+ libpq_kwargs = libpq_kwargs + {
+ 'vs_module_defs': libpq_def,
+ 'soversion': '',
+ }
+else
+ libpq_kwargs = libpq_kwargs + {
+ 'link_args': '-Wl,--version-script=' + export_file.full_path(),
+ 'link_depends': export_file,
+ 'soversion': '5',
+ }
+endif
+
+libpq_so = shared_library('pq',
+ libpq_sources,
+ include_directories : [libpq_inc, postgres_inc],
+ c_args: ['-DFRONTEND'],
+ c_pch: '../../include/pch/c_pch.h',
+ dependencies: libpq_deps,
+ kwargs: libpq_kwargs,
+)
+
+libpq = declare_dependency(
+ link_with: [libpq_so],
+ include_directories: [include_directories('.')]
+)
+
+install_headers('libpq-fe.h', 'libpq-events.h')
+# FIXME: adjust path
+install_headers('libpq-int.h', 'pqexpbuffer.h')
+install_data('pg_service.conf.sample', install_dir: get_option('datadir'))
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 00000000000..414be1db419
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,10 @@
+# libraries that other subsystems might depend uppon first, in their
+# respective dependency order
+
+subdir('timezone')
+
+subdir('backend')
+
+subdir('bin')
+
+subdir('pl')
diff --git a/src/pl/meson.build b/src/pl/meson.build
new file mode 100644
index 00000000000..b720e922093
--- /dev/null
+++ b/src/pl/meson.build
@@ -0,0 +1,4 @@
+subdir('plpgsql')
+
+subdir('plperl')
+subdir('plpython')
diff --git a/src/pl/plperl/meson.build b/src/pl/plperl/meson.build
new file mode 100644
index 00000000000..a5a994e845f
--- /dev/null
+++ b/src/pl/plperl/meson.build
@@ -0,0 +1,81 @@
+if not perl_dep.found()
+ subdir_done()
+endif
+
+plperl_sources = files(
+ 'plperl.c',
+)
+
+subppdir = run_command(perl, '-e', 'use List::Util qw(first); print first { -r "$_/ExtUtils/xsubpp" } @INC',
+ check: true).stdout()
+xsubpp = '@0@/ExtUtils/xsubpp'.format(subppdir)
+typemap = '@0@/ExtUtils/typemap'.format(subppdir)
+
+plperl_sources += custom_target('perlchunks.h',
+ input: files('plc_perlboot.pl', 'plc_trusted.pl'),
+ output: 'perlchunks.h',
+ capture: true,
+ command: [perl, files('text2macro.pl'), '--strip=^(\#.*|\s*)$', '@INPUT@']
+)
+
+plperl_sources += custom_target('plperl_opmask.h',
+ input: files('plperl_opmask.pl'),
+ output: 'plperl_opmask.h',
+ command: [perl, '@INPUT@', '@OUTPUT@']
+)
+
+foreach n : ['SPI', 'Util']
+ xs = files(n+'.xs')
+ xs_c_name = n+'.c'
+
+ # FIXME: -output option is only available in perl 5.9.3 - but that's
+ # probably a fine minimum requirement?
+ xs_c = custom_target(xs_c_name,
+ input: xs,
+ output: xs_c_name,
+ command: [perl, xsubpp, '-typemap', typemap, '-output', '@OUTPUT@', '@INPUT@']
+ )
+ plperl_sources += xs_c
+endforeach
+
+plperl_inc = include_directories('.')
+shared_module('plperl',
+ plperl_sources,
+ c_pch: '../../include/pch/postgres_pch.h',
+ include_directories: [plperl_inc, postgres_inc],
+ kwargs: pg_mod_args + {
+ 'dependencies': [perl_dep, pg_mod_args['dependencies']],
+ },
+)
+
+install_data(
+ 'plperl.control',
+ 'plperl--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+install_data(
+ 'plperlu.control',
+ 'plperlu--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+regress_tests += {
+ 'name': 'plperl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'plperl_setup',
+ 'plperl',
+ 'plperl_lc',
+ 'plperl_trigger',
+ 'plperl_shared',
+ 'plperl_elog',
+ 'plperl_util',
+ 'plperl_init',
+ 'plperlu',
+ 'plperl_array',
+ 'plperl_call',
+ 'plperl_transaction',
+ ],
+}
diff --git a/src/pl/plpgsql/meson.build b/src/pl/plpgsql/meson.build
new file mode 100644
index 00000000000..9537275d67c
--- /dev/null
+++ b/src/pl/plpgsql/meson.build
@@ -0,0 +1 @@
+subdir('src')
diff --git a/src/pl/plpgsql/src/meson.build b/src/pl/plpgsql/src/meson.build
new file mode 100644
index 00000000000..b040e5e8507
--- /dev/null
+++ b/src/pl/plpgsql/src/meson.build
@@ -0,0 +1,67 @@
+plpgsql_sources = files(
+ 'pl_comp.c',
+ 'pl_exec.c',
+ 'pl_funcs.c',
+ 'pl_handler.c',
+ 'pl_scanner.c',
+)
+
+plpgsql_sources += custom_target('gram',
+ input: ['pl_gram.y'],
+ output: ['pl_gram.c', 'pl_gram.h'],
+ command: [bison, bisonflags, '-d', '-o', '@OUTPUT0@', '@INPUT0@'])
+
+gen_plerrcodes = files('generate-plerrcodes.pl')
+plpgsql_sources += custom_target('plerrcodes',
+ input: ['../../../../src/backend/utils/errcodes.txt'],
+ output: ['plerrcodes.h'],
+ command: [perl, gen_plerrcodes, '@INPUT0@'],
+ capture: true)
+
+gen_keywordlist = files('../../../../src/tools/gen_keywordlist.pl')
+plpgsql_sources += custom_target('pl_reserved_kwlist',
+ input: ['pl_reserved_kwlist.h'],
+ output: ['pl_reserved_kwlist_d.h'],
+ command: [perl, '-I', '@SOURCE_ROOT@/src/tools', gen_keywordlist, '--output', '@OUTDIR@', '--varname', 'ReservedPLKeywords', '@INPUT@']
+)
+
+plpgsql_sources += custom_target('pl_unreserved_kwlist',
+ input: ['pl_unreserved_kwlist.h'],
+ output: ['pl_unreserved_kwlist_d.h'],
+ command: [perl, '-I', '@SOURCE_ROOT@/src/tools', gen_keywordlist, '--output', '@OUTDIR@', '--varname', 'UnreservedPLKeywords', '@INPUT@']
+)
+
+shared_module('plpgsql',
+ plpgsql_sources,
+ c_pch: '../../../include/pch/postgres_pch.h',
+ include_directories: include_directories('.'),
+ kwargs: pg_mod_args,
+)
+
+install_data('plpgsql.control', 'plpgsql--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+install_headers('plpgsql.h',
+ install_dir: get_option('includedir') / 'server')
+
+
+regress_tests += {
+ 'name': 'plpgsql',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'plpgsql_array',
+ 'plpgsql_call',
+ 'plpgsql_control',
+ 'plpgsql_copy',
+ 'plpgsql_domain',
+ 'plpgsql_record',
+ 'plpgsql_cache',
+ 'plpgsql_simple',
+ 'plpgsql_transaction',
+ 'plpgsql_trap',
+ 'plpgsql_trigger',
+ 'plpgsql_varprops',
+ ],
+}
diff --git a/src/pl/plpython/expected/meson.build b/src/pl/plpython/expected/meson.build
new file mode 100644
index 00000000000..4172ced2208
--- /dev/null
+++ b/src/pl/plpython/expected/meson.build
@@ -0,0 +1,14 @@
+# FIXME: adding the variant files like this is an abysmal hack in an abysmal hack
+foreach r2 : plpython_regress + ['plpython_error_5', 'plpython_types_3']
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+
+ s2 = '@0@.out'.format(r2)
+ s3 = '@0@.out'.format(r3)
+ plpython3_test_deps += custom_target(s3,
+ input: '@0@.out'.format(r2),
+ output: '@0@.out'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ )
+endforeach
diff --git a/src/pl/plpython/meson.build b/src/pl/plpython/meson.build
new file mode 100644
index 00000000000..14fe8bd7c7f
--- /dev/null
+++ b/src/pl/plpython/meson.build
@@ -0,0 +1,100 @@
+if not python3.found()
+ subdir_done()
+endif
+
+plpython_sources = files(
+ 'plpy_cursorobject.c',
+ 'plpy_elog.c',
+ 'plpy_exec.c',
+ 'plpy_main.c',
+ 'plpy_planobject.c',
+ 'plpy_plpymodule.c',
+ 'plpy_procedure.c',
+ 'plpy_resultobject.c',
+ 'plpy_spi.c',
+ 'plpy_subxactobject.c',
+ 'plpy_typeio.c',
+ 'plpy_util.c',
+)
+
+plpython_sources += custom_target('spiexceptions.h',
+ input: files('../../backend/utils/errcodes.txt'),
+ output: 'spiexceptions.h',
+ command: [perl, files('generate-spiexceptions.pl'), '@INPUT@'],
+ capture: true
+ )
+
+
+# FIXME: need to duplicate import library ugliness?
+plpython_inc = include_directories('.')
+
+shared_module('plpython3',
+ plpython_sources,
+ c_pch: '../../include/pch/postgres_pch.h',
+ include_directories: [plpython_inc, postgres_inc],
+ kwargs: pg_mod_args + {
+ 'dependencies': [python3, pg_mod_args['dependencies']],
+ },
+)
+
+# FIXME: Only install the relevant versions
+install_data(
+ 'plpythonu.control',
+ 'plpython2u.control',
+ 'plpython3u.control',
+ 'plpythonu--1.0.sql',
+ 'plpython2u--1.0.sql',
+ 'plpython3u--1.0.sql',
+ install_dir: get_option('datadir') / 'extension'
+)
+
+# FIXME: Think about python2
+
+
+plpython_regress_cmd = [
+ sed,
+ '-f', files('regress-python3-mangle.sed'),
+ '@INPUT0@'
+]
+
+plpython_regress = [
+ 'plpython_schema',
+ 'plpython_populate',
+ 'plpython_test',
+ 'plpython_do',
+ 'plpython_global',
+ 'plpython_import',
+ 'plpython_spi',
+ 'plpython_newline',
+ 'plpython_void',
+ 'plpython_call',
+ 'plpython_params',
+ 'plpython_setof',
+ 'plpython_record',
+ 'plpython_trigger',
+ 'plpython_types',
+ 'plpython_error',
+ 'plpython_ereport',
+ 'plpython_unicode',
+ 'plpython_quote',
+ 'plpython_composite',
+ 'plpython_subtransaction',
+ 'plpython_transaction',
+ 'plpython_drop',
+]
+
+plpython3_regress = []
+plpython3_test_deps = []
+
+# FIXME: this is an abysmal hack
+subdir('sql')
+subdir('expected')
+
+regress_tests += {
+ 'name': 'plpython',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': plpython3_regress,
+ 'deps': plpython3_test_deps,
+ 'regress_args': ['--inputdir', meson.current_build_dir()],
+}
diff --git a/src/pl/plpython/sql/meson.build b/src/pl/plpython/sql/meson.build
new file mode 100644
index 00000000000..9923425e5ff
--- /dev/null
+++ b/src/pl/plpython/sql/meson.build
@@ -0,0 +1,15 @@
+# Convert plpython2 regression tests to plpython3 ones
+foreach r2 : plpython_regress
+ # string.replace is only in meson 0.58
+ r3 = 'plpython3' + r2.split('plpython')[1]
+ plpython3_regress += r3
+
+ s2 = '@0@.sql'.format(r2)
+ s3 = '@0@.sql'.format(r3)
+ plpython3_test_deps += custom_target(s3,
+ input: '@0@.sql'.format(r2),
+ output: '@0@.sql'.format(r3),
+ capture: true,
+ command: plpython_regress_cmd,
+ )
+endforeach
diff --git a/src/port/meson.build b/src/port/meson.build
new file mode 100644
index 00000000000..c6e4c788052
--- /dev/null
+++ b/src/port/meson.build
@@ -0,0 +1,146 @@
+pgport_sources = [
+ 'bsearch_arg.c',
+ 'chklocale.c',
+ 'erand48.c',
+ 'inet_net_ntop.c',
+ 'noblock.c',
+ 'path.c',
+ 'pg_bitutils.c',
+ 'pg_strong_random.c',
+ 'pgcheckdir.c',
+ 'pgmkdirp.c',
+ 'pgsleep.c',
+ 'pgstrcasecmp.c',
+ 'pgstrsignal.c',
+ 'pqsignal.c',
+ 'qsort.c',
+ 'qsort_arg.c',
+ 'quotes.c',
+ 'snprintf.c',
+ 'strerror.c',
+ 'tar.c',
+ 'thread.c',
+]
+
+if host_machine.system() == 'windows'
+ pgport_sources += files(
+ 'dirmod.c',
+ 'kill.c',
+ 'open.c',
+ 'system.c',
+ 'win32env.c',
+ 'win32error.c',
+ 'win32security.c',
+ 'win32setlocale.c',
+ 'win32stat.c',
+ )
+endif
+
+if cc.get_id() == 'msvc'
+ pgport_sources += files(
+ 'dirent.c',
+ )
+endif
+
+# Replacement functionality to be built if corresponding configure symbol
+# is false
+replace_funcs_neg = [
+ ['dlopen'],
+ ['explicit_bzero'],
+ ['fls'],
+ ['getaddrinfo'],
+ ['getopt'],
+ ['getopt_long'],
+ ['getpeereid'],
+ ['getpeereid'],
+ ['getrusage'],
+ ['gettimeofday'],
+ ['inet_aton'],
+ ['link'],
+ ['mkdtemp'],
+ ['pread'],
+ ['preadv', 'HAVE_DECL_PREADV'],
+ ['pwrite'],
+ ['pwritev', 'HAVE_DECL_PWRITEV'],
+ ['random'],
+ ['srandom'],
+ ['strlcat'],
+ ['strlcpy'],
+ ['strnlen'],
+]
+
+# Replacement functionality to be built if corresponding configure symbol
+# is true
+replace_funcs_pos = [
+ ['pg_crc32c_sse42', 'USE_SSE42_CRC32C'],
+ ['pg_crc32c_sse42', 'USE_SSE42_CRC32C_WITH_RUNTIME_CHECK'],
+ ['pg_crc32c_sse42_choose', 'USE_SSE42_CRC32C_WITH_RUNTIME_CHECK'],
+ ['pg_crc32c_sb8', 'USE_SSE42_CRC32C_WITH_RUNTIME_CHECK'],
+ ['pg_crc32c_armv8', 'USE_ARMV8_CRC32C'],
+ ['pg_crc32c_sb8', 'USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK'],
+ ['pg_crc32c_armv8_choose', 'USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK'],
+]
+
+foreach f : replace_funcs_neg
+ func = f.get(0)
+ varname = f.get(1, 'HAVE_@0@'.format(func.to_upper()))
+ filename = '@0@.c'.format(func)
+
+ val = '@0@'.format(cdata.get(varname, 'false'))
+ if val == 'false' or val == '0'
+ pgport_sources += files(filename)
+ endif
+endforeach
+
+foreach f : replace_funcs_pos
+ func = f.get(0)
+ varname = f.get(1, 'HAVE_@0@'.format(func.to_upper()))
+ filename = '@0@.c'.format(func)
+
+ val = '@0@'.format(cdata.get(varname, 'false'))
+ if val == 'true' or val == '1'
+ pgport_sources += files(filename)
+ endif
+endforeach
+
+
+if (host_machine.system() == 'windows' or host_machine.system() == 'cygwin') and \
+ (cc.get_id() != 'msvc' or cc.version().version_compare('<14.0'))
+
+ # Cygwin and (apparently, based on test results) Mingw both
+ # have a broken strtof(), so substitute the same replacement
+ # code we use with VS2013. That's not a perfect fix, since
+ # (unlike with VS2013) it doesn't avoid double-rounding, but
+ # we have no better options. To get that, though, we have to
+ # force the file to be compiled despite HAVE_STRTOF.
+ pgport_sources += files('strtof.c')
+ message('On @0@ with compiler @1@ @2@ we will use our strtof wrapper.'.format(
+ host_machine.system(), cc.get_id(), cc.version()))
+endif
+
+if not cdata.has('HAVE_PTHREAD_BARRIER_WAIT') and host_machine.system() != 'windows'
+ pgport_sources += files('pthread_barrier_wait.c')
+endif
+
+
+pgport_srv = static_library('pgport_srv',
+ pgport_sources,
+ c_pch: '../include/pch/c_pch.h',
+ dependencies: [ssl, backend_port_code],
+ kwargs: internal_lib_args,
+)
+
+pgport_static = static_library('pgport',
+ pgport_sources,
+ c_pch: '../include/pch/c_pch.h',
+ dependencies: [ssl, frontend_port_code],
+ kwargs: default_lib_args,
+)
+
+pgport_shlib = static_library('pgport_shlib',
+ pgport_sources,
+ c_pch: '../include/pch/c_pch.h',
+ pic: true,
+ dependencies: [ssl, frontend_port_code],
+ kwargs: default_lib_args,
+)
diff --git a/src/test/authentication/meson.build b/src/test/authentication/meson.build
new file mode 100644
index 00000000000..be41fb314a5
--- /dev/null
+++ b/src/test/authentication/meson.build
@@ -0,0 +1,9 @@
+tap_tests += {
+ 'name': 'authentication',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_password.pl',
+ 't/002_saslprep.pl',
+ ],
+}
diff --git a/src/test/isolation/meson.build b/src/test/isolation/meson.build
new file mode 100644
index 00000000000..637b4807550
--- /dev/null
+++ b/src/test/isolation/meson.build
@@ -0,0 +1,49 @@
+# pg_regress_c helpfully provided by regress/meson.build
+
+isolation_sources = pg_regress_c + files(
+ 'isolation_main.c',
+)
+
+# see src/backend/replication/meson.build for depend logic
+spec_scanner = custom_target('specscanner',
+ input : files('specscanner.l'),
+ output : ['specscanner.c'],
+ command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+)
+
+isolationtester_sources = files('isolationtester.c')
+isolationtester_sources += custom_target('specparse',
+ input: 'specparse.y',
+ output: 'specparse.c',
+ depends: spec_scanner,
+ command: [bison, bisonflags, '-o', '@OUTPUT@', '@INPUT0@'])
+
+pg_isolation_regress = executable('pg_isolation_regress',
+ isolation_sources,
+ c_args: pg_regress_cflags,
+ include_directories: [pg_regress_inc],
+ dependencies: [frontend_code],
+ kwargs: default_bin_args + {
+ 'install': false
+ },
+)
+
+isolationtester = executable('isolationtester',
+ isolationtester_sources,
+ include_directories: include_directories('.'),
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args + {
+ 'install': false
+ },
+)
+
+isolation_tests += {
+ 'name': 'main',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'schedule': files('isolation_schedule'),
+ 'test_kwargs': {
+ 'priority': 40,
+ 'timeout': 1000,
+ },
+}
diff --git a/src/test/kerberos/meson.build b/src/test/kerberos/meson.build
new file mode 100644
index 00000000000..9f9957a3b4c
--- /dev/null
+++ b/src/test/kerberos/meson.build
@@ -0,0 +1,12 @@
+tap_tests += {
+ 'name': 'kerberos',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_auth.pl',
+ ],
+ 'env' : {
+ 'with_gssapi': gssapi.found() ? 'yes' : 'no',
+ 'with_krb_srvnam': 'postgres',
+ },
+}
diff --git a/src/test/ldap/meson.build b/src/test/ldap/meson.build
new file mode 100644
index 00000000000..58eb9adc6f5
--- /dev/null
+++ b/src/test/ldap/meson.build
@@ -0,0 +1,9 @@
+tap_tests += {
+ 'name': 'ldap',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_auth.pl',
+ ],
+ 'env' : {'with_ldap': ldap.found() ? 'yes' : 'no'},
+}
diff --git a/src/test/meson.build b/src/test/meson.build
new file mode 100644
index 00000000000..f0b0d3d3b5e
--- /dev/null
+++ b/src/test/meson.build
@@ -0,0 +1,19 @@
+subdir('regress')
+subdir('isolation')
+
+subdir('authentication')
+subdir('recovery')
+subdir('subscription')
+subdir('modules')
+
+if ssl.found()
+ subdir('ssl')
+endif
+
+if ldap.found()
+ subdir('ldap')
+endif
+
+if gssapi.found()
+ subdir('kerberos')
+endif
diff --git a/src/test/modules/brin/meson.build b/src/test/modules/brin/meson.build
new file mode 100644
index 00000000000..99ccaac5b38
--- /dev/null
+++ b/src/test/modules/brin/meson.build
@@ -0,0 +1,19 @@
+isolation_tests += {
+ 'name': 'brin',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'specs': [
+ 'summarization-and-inprogress-insertion',
+ ]
+}
+
+
+tap_tests += {
+ 'name': 'brin',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/01_workitems.pl',
+ ],
+}
+
diff --git a/src/test/modules/commit_ts/meson.build b/src/test/modules/commit_ts/meson.build
new file mode 100644
index 00000000000..2794d837c35
--- /dev/null
+++ b/src/test/modules/commit_ts/meson.build
@@ -0,0 +1,20 @@
+regress_tests += {
+ 'name': 'commit_ts',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'commit_timestamp',
+ ]
+}
+
+tap_tests += {
+ 'name': 'commit_ts',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_base.pl',
+ 't/002_standby.pl',
+ 't/003_standby_2.pl',
+ 't/004_restart.pl',
+ ],
+}
diff --git a/src/test/modules/delay_execution/meson.build b/src/test/modules/delay_execution/meson.build
new file mode 100644
index 00000000000..58fe5a1a21d
--- /dev/null
+++ b/src/test/modules/delay_execution/meson.build
@@ -0,0 +1,15 @@
+# FIXME: prevent install during main install, but not during test :/
+delay_execution = shared_module('delay_execution',
+ ['delay_execution.c'],
+ kwargs: pg_mod_args,
+)
+
+isolation_tests += {
+ 'name': 'delay_execution',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'specs': [
+ 'partition-addition',
+ 'partition-removal-1',
+ ]
+}
diff --git a/src/test/modules/dummy_index_am/meson.build b/src/test/modules/dummy_index_am/meson.build
new file mode 100644
index 00000000000..a9c49bd9554
--- /dev/null
+++ b/src/test/modules/dummy_index_am/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+dummy_index_am = shared_module('dummy_index_am',
+ ['dummy_index_am.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'dummy_index_am.control',
+ 'dummy_index_am--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'dummy_index_am',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'reloptions',
+ ]
+}
diff --git a/src/test/modules/dummy_seclabel/meson.build b/src/test/modules/dummy_seclabel/meson.build
new file mode 100644
index 00000000000..ed31d8f9530
--- /dev/null
+++ b/src/test/modules/dummy_seclabel/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+dummy_seclabel = shared_module('dummy_seclabel',
+ ['dummy_seclabel.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'dummy_seclabel.control',
+ 'dummy_seclabel--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'dummy_seclabel',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'dummy_seclabel',
+ ]
+}
diff --git a/src/test/modules/libpq_pipeline/meson.build b/src/test/modules/libpq_pipeline/meson.build
new file mode 100644
index 00000000000..2f850215a6f
--- /dev/null
+++ b/src/test/modules/libpq_pipeline/meson.build
@@ -0,0 +1,21 @@
+libpq_pipeline = executable('libpq_pipeline',
+ files(
+ 'libpq_pipeline.c',
+ ),
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args + {
+ 'install': false,
+ },
+)
+
+tap_tests += {
+ 'name': 'libpq_pipeline',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'env': {
+ 'PATH': meson.current_build_dir(),
+ },
+ 'tests': [
+ 't/001_libpq_pipeline.pl',
+ ]
+}
diff --git a/src/test/modules/meson.build b/src/test/modules/meson.build
new file mode 100644
index 00000000000..c98225c6e7b
--- /dev/null
+++ b/src/test/modules/meson.build
@@ -0,0 +1,25 @@
+subdir('brin')
+subdir('commit_ts')
+subdir('delay_execution')
+subdir('dummy_index_am')
+subdir('dummy_seclabel')
+subdir('libpq_pipeline')
+subdir('plsample')
+subdir('snapshot_too_old')
+subdir('spgist_name_ops')
+subdir('ssl_passphrase_callback')
+subdir('test_bloomfilter')
+subdir('test_ddl_deparse')
+subdir('test_extensions')
+subdir('test_ginpostinglist')
+subdir('test_integerset')
+subdir('test_misc')
+subdir('test_parser')
+subdir('test_pg_dump')
+subdir('test_predtest')
+subdir('test_rbtree')
+subdir('test_regex')
+subdir('test_rls_hooks')
+subdir('test_shm_mq')
+subdir('unsafe_tests')
+subdir('worker_spi')
diff --git a/src/test/modules/plsample/meson.build b/src/test/modules/plsample/meson.build
new file mode 100644
index 00000000000..3f70688fb89
--- /dev/null
+++ b/src/test/modules/plsample/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+plsample = shared_module('plsample',
+ ['plsample.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'plsample.control',
+ 'plsample--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'plsample',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'plsample',
+ ]
+}
diff --git a/src/test/modules/snapshot_too_old/meson.build b/src/test/modules/snapshot_too_old/meson.build
new file mode 100644
index 00000000000..cdf4afd18b8
--- /dev/null
+++ b/src/test/modules/snapshot_too_old/meson.build
@@ -0,0 +1,11 @@
+isolation_tests += {
+ 'name': 'snapshot_too_old',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'specs': [
+ 'sto_using_cursor',
+ 'sto_using_select',
+ 'sto_using_hash_index',
+ ],
+ 'regress_args': ['--temp-config', files('sto.conf')],
+}
diff --git a/src/test/modules/spgist_name_ops/meson.build b/src/test/modules/spgist_name_ops/meson.build
new file mode 100644
index 00000000000..19aa00892f1
--- /dev/null
+++ b/src/test/modules/spgist_name_ops/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+spgist_name_ops = shared_module('spgist_name_ops',
+ ['spgist_name_ops.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'spgist_name_ops.control',
+ 'spgist_name_ops--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'spgist_name_ops',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'spgist_name_ops',
+ ]
+}
diff --git a/src/test/modules/ssl_passphrase_callback/meson.build b/src/test/modules/ssl_passphrase_callback/meson.build
new file mode 100644
index 00000000000..b9fa5ee1cdc
--- /dev/null
+++ b/src/test/modules/ssl_passphrase_callback/meson.build
@@ -0,0 +1,45 @@
+if not ssl.found()
+ subdir_done()
+endif
+
+# FIXME: prevent install during main install, but not during test :/
+ssl_passphrase_callback = shared_module('ssl_passphrase_func',
+ ['ssl_passphrase_func.c'],
+ kwargs: pg_mod_args + {
+ 'dependencies': [ssl, pg_mod_args['dependencies']],
+ }
+)
+
+# Targets to generate or remove the ssl certificate and key. Need to be copied
+# to the source afterwards. Normally not needed.
+
+openssl = find_program('openssl', native: true, required: false)
+
+if openssl.found()
+ cert = custom_target('server.crt',
+ output: ['server.crt', 'server.ckey'],
+ command: [openssl, 'req', '-new', '-x509', '-days', '10000', '-nodes', '-out', '@OUTPUT0@',
+ '-keyout', '@OUTPUT1@', '-subj', '/CN=localhost'],
+ build_by_default: false,
+ install: false,
+ )
+
+ # needs to agree with what's in the test script
+ pass = 'FooBaR1'
+
+ enccert = custom_target('server.key',
+ input: [cert[1]],
+ output: ['server.key'],
+ command: [openssl, 'rsa', '-aes256', '-in', '@INPUT0@', '-out', '@OUTPUT0@', '-passout', 'pass:@0@'.format(pass)]
+ )
+endif
+
+tap_tests += {
+ 'name': 'ssl_passphrase_callback',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_testfunc.pl',
+ ],
+ 'env': {'with_ssl': 'openssl'},
+}
diff --git a/src/test/modules/test_bloomfilter/meson.build b/src/test/modules/test_bloomfilter/meson.build
new file mode 100644
index 00000000000..2e995310876
--- /dev/null
+++ b/src/test/modules/test_bloomfilter/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_bloomfilter = shared_module('test_bloomfilter',
+ ['test_bloomfilter.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_bloomfilter.control',
+ 'test_bloomfilter--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_bloomfilter',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_bloomfilter',
+ ]
+}
diff --git a/src/test/modules/test_ddl_deparse/meson.build b/src/test/modules/test_ddl_deparse/meson.build
new file mode 100644
index 00000000000..3618229594d
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/meson.build
@@ -0,0 +1,40 @@
+# FIXME: prevent install during main install, but not during test :/
+test_ddl_deparse = shared_module('test_ddl_deparse',
+ ['test_ddl_deparse.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_ddl_deparse.control',
+ 'test_ddl_deparse--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_ddl_deparse',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_ddl_deparse',
+ 'create_extension',
+ 'create_schema',
+ 'create_type',
+ 'create_conversion',
+ 'create_domain',
+ 'create_sequence_1',
+ 'create_table',
+ 'create_transform',
+ 'alter_table',
+ 'create_view',
+ 'create_trigger',
+ 'create_rule',
+ 'comment_on',
+ 'alter_function',
+ 'alter_sequence',
+ 'alter_ts_config',
+ 'alter_type_enum',
+ 'opfamily',
+ 'defprivs',
+ 'matviews',
+ ]
+}
diff --git a/src/test/modules/test_extensions/meson.build b/src/test/modules/test_extensions/meson.build
new file mode 100644
index 00000000000..2ca504f8588
--- /dev/null
+++ b/src/test/modules/test_extensions/meson.build
@@ -0,0 +1,38 @@
+# FIXME: prevent install during main install, but not during test :/
+install_data(
+ 'test_ext1--1.0.sql',
+ 'test_ext1.control',
+ 'test_ext2--1.0.sql',
+ 'test_ext2.control',
+ 'test_ext3--1.0.sql',
+ 'test_ext3.control',
+ 'test_ext4--1.0.sql',
+ 'test_ext4.control',
+ 'test_ext5--1.0.sql',
+ 'test_ext5.control',
+ 'test_ext6--1.0.sql',
+ 'test_ext6.control',
+ 'test_ext7--1.0--2.0.sql',
+ 'test_ext7--1.0.sql',
+ 'test_ext7.control',
+ 'test_ext8--1.0.sql',
+ 'test_ext8.control',
+ 'test_ext_cyclic1--1.0.sql',
+ 'test_ext_cyclic1.control',
+ 'test_ext_cyclic2--1.0.sql',
+ 'test_ext_cyclic2.control',
+ 'test_ext_evttrig--1.0--2.0.sql',
+ 'test_ext_evttrig--1.0.sql',
+ 'test_ext_evttrig.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_extensions',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_extensions',
+ 'test_extdepend',
+ ]
+}
diff --git a/src/test/modules/test_ginpostinglist/meson.build b/src/test/modules/test_ginpostinglist/meson.build
new file mode 100644
index 00000000000..e177e90019f
--- /dev/null
+++ b/src/test/modules/test_ginpostinglist/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_ginpostinglist = shared_module('test_ginpostinglist',
+ ['test_ginpostinglist.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_ginpostinglist.control',
+ 'test_ginpostinglist--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_ginpostinglist',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_ginpostinglist',
+ ]
+}
diff --git a/src/test/modules/test_integerset/meson.build b/src/test/modules/test_integerset/meson.build
new file mode 100644
index 00000000000..ccb8db725e5
--- /dev/null
+++ b/src/test/modules/test_integerset/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_integerset = shared_module('test_integerset',
+ ['test_integerset.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_integerset.control',
+ 'test_integerset--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_integerset',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_integerset',
+ ]
+}
diff --git a/src/test/modules/test_misc/meson.build b/src/test/modules/test_misc/meson.build
new file mode 100644
index 00000000000..4ee8c562ac0
--- /dev/null
+++ b/src/test/modules/test_misc/meson.build
@@ -0,0 +1,8 @@
+tap_tests += {
+ 'name': 'misc',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_constraint_validation.pl',
+ ],
+}
diff --git a/src/test/modules/test_parser/meson.build b/src/test/modules/test_parser/meson.build
new file mode 100644
index 00000000000..c43ae95cf2c
--- /dev/null
+++ b/src/test/modules/test_parser/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_parser = shared_module('test_parser',
+ ['test_parser.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_parser.control',
+ 'test_parser--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_parser',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_parser',
+ ]
+}
diff --git a/src/test/modules/test_pg_dump/meson.build b/src/test/modules/test_pg_dump/meson.build
new file mode 100644
index 00000000000..110b3876832
--- /dev/null
+++ b/src/test/modules/test_pg_dump/meson.build
@@ -0,0 +1,24 @@
+# FIXME: prevent install during main install, but not during test :/
+install_data(
+ 'test_pg_dump.control',
+ 'test_pg_dump--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_pg_dump',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_pg_dump',
+ ]
+}
+
+tap_tests += {
+ 'name': 'test_pg_dump',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests': [
+ 't/001_base.pl',
+ ]
+}
diff --git a/src/test/modules/test_predtest/meson.build b/src/test/modules/test_predtest/meson.build
new file mode 100644
index 00000000000..9f9a9475c8b
--- /dev/null
+++ b/src/test/modules/test_predtest/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_predtest = shared_module('test_predtest',
+ ['test_predtest.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_predtest.control',
+ 'test_predtest--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_predtest',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_predtest',
+ ]
+}
diff --git a/src/test/modules/test_rbtree/meson.build b/src/test/modules/test_rbtree/meson.build
new file mode 100644
index 00000000000..6bbeca39ec9
--- /dev/null
+++ b/src/test/modules/test_rbtree/meson.build
@@ -0,0 +1,20 @@
+# FIXME: prevent install during main install, but not during test :/
+test_rbtree = shared_module('test_rbtree',
+ ['test_rbtree.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_rbtree.control',
+ 'test_rbtree--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_rbtree',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_rbtree',
+ ]
+}
diff --git a/src/test/modules/test_regex/meson.build b/src/test/modules/test_regex/meson.build
new file mode 100644
index 00000000000..c5fd92ee1c6
--- /dev/null
+++ b/src/test/modules/test_regex/meson.build
@@ -0,0 +1,21 @@
+# FIXME: prevent install during main install, but not during test :/
+test_regex = shared_module('test_regex',
+ ['test_regex.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_regex.control',
+ 'test_regex--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_regex',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_regex',
+ 'test_regex_utf8',
+ ]
+}
diff --git a/src/test/modules/test_rls_hooks/meson.build b/src/test/modules/test_rls_hooks/meson.build
new file mode 100644
index 00000000000..fb8b697e160
--- /dev/null
+++ b/src/test/modules/test_rls_hooks/meson.build
@@ -0,0 +1,19 @@
+# FIXME: prevent install during main install, but not during test :/
+test_rls_hooks = shared_module('test_rls_hooks',
+ ['test_rls_hooks.c'],
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_rls_hooks.control',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_rls_hooks',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_rls_hooks',
+ ]
+}
diff --git a/src/test/modules/test_shm_mq/meson.build b/src/test/modules/test_shm_mq/meson.build
new file mode 100644
index 00000000000..159943f861e
--- /dev/null
+++ b/src/test/modules/test_shm_mq/meson.build
@@ -0,0 +1,24 @@
+# FIXME: prevent install during main install, but not during test :/
+test_shm_mq = shared_module('test_shm_mq',
+ files(
+ 'setup.c',
+ 'test.c',
+ 'worker.c',
+ ),
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'test_shm_mq.control',
+ 'test_shm_mq--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'test_shm_mq',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'test_shm_mq',
+ ]
+}
diff --git a/src/test/modules/unsafe_tests/meson.build b/src/test/modules/unsafe_tests/meson.build
new file mode 100644
index 00000000000..9ed4d587721
--- /dev/null
+++ b/src/test/modules/unsafe_tests/meson.build
@@ -0,0 +1,9 @@
+regress_tests += {
+ 'name': 'unsafe_tests',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'rolenames',
+ 'alter_system_table',
+ ],
+}
diff --git a/src/test/modules/worker_spi/meson.build b/src/test/modules/worker_spi/meson.build
new file mode 100644
index 00000000000..a80bd493ea7
--- /dev/null
+++ b/src/test/modules/worker_spi/meson.build
@@ -0,0 +1,23 @@
+# FIXME: prevent install during main install, but not during test :/
+test_worker_spi = shared_module('worker_spi',
+ files(
+ 'worker_spi.c',
+ ),
+ kwargs: pg_mod_args,
+)
+
+install_data(
+ 'worker_spi.control',
+ 'worker_spi--1.0.sql',
+ kwargs: contrib_data_args,
+)
+
+regress_tests += {
+ 'name': 'worker_spi',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'sql': [
+ 'worker_spi',
+ ],
+ 'regress_args': ['--temp-config', files('dynamic.conf'), '--dbname=contrib_regression'],
+}
diff --git a/src/test/recovery/meson.build b/src/test/recovery/meson.build
new file mode 100644
index 00000000000..5678e1d27ae
--- /dev/null
+++ b/src/test/recovery/meson.build
@@ -0,0 +1,33 @@
+tap_tests += {
+ 'name': 'recovery',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'tests' : [
+ 't/001_stream_rep.pl',
+ 't/002_archiving.pl',
+ 't/003_recovery_targets.pl',
+ 't/004_timeline_switch.pl',
+ 't/005_replay_delay.pl',
+ 't/006_logical_decoding.pl',
+ 't/007_sync_rep.pl',
+ 't/008_fsm_truncation.pl',
+ 't/009_twophase.pl',
+ 't/010_logical_decoding_timelines.pl',
+ 't/011_crash_recovery.pl',
+ 't/012_subtransactions.pl',
+ 't/013_crash_restart.pl',
+ 't/014_unlogged_reinit.pl',
+ 't/015_promotion_pages.pl',
+ 't/016_min_consistency.pl',
+ 't/017_shm.pl',
+ 't/018_wal_optimize.pl',
+ 't/019_replslot_limit.pl',
+ 't/020_archive_status.pl',
+ 't/021_row_visibility.pl',
+ 't/022_crash_temp_files.pl',
+ 't/023_pitr_prepared_xact.pl',
+ 't/024_archive_recovery.pl',
+ 't/025_stuck_on_old_timeline.pl',
+ 't/026_overwrite_contrecord.pl',
+ ]
+}
diff --git a/src/test/regress/meson.build b/src/test/regress/meson.build
new file mode 100644
index 00000000000..1a2f7675e87
--- /dev/null
+++ b/src/test/regress/meson.build
@@ -0,0 +1,57 @@
+# also used by isolationtester
+pg_regress_c = files('pg_regress.c')
+pg_regress_inc = include_directories('.')
+
+regress_sources = pg_regress_c + files(
+ 'pg_regress_main.c'
+)
+
+pg_regress_cflags = ['-DHOST_TUPLE="frak"', '-DSHELLPROG="/bin/sh"']
+
+pg_regress = executable('pg_regress',
+ regress_sources,
+ c_args: pg_regress_cflags,
+ dependencies: [frontend_code, libpq],
+ kwargs: default_bin_args + {
+ 'install': false
+ },
+)
+
+regress_module = shared_module('regress',
+ ['regress.c'],
+ kwargs: pg_mod_args + {
+ 'install': false,
+ },
+)
+
+# Get some extra C modules from contrib/spi but mark them as not to be
+# installed.
+# FIXME: avoid the duplication.
+
+shared_module('autoinc',
+ ['../../../contrib/spi/autoinc.c'],
+ kwargs: pg_mod_args + {
+ 'install': false,
+ },
+)
+
+shared_module('refint',
+ ['../../../contrib/spi/refint.c'],
+ kwargs: pg_mod_args + {
+ 'c_args': refint_cflags + contrib_mod_args['c_args'],
+ 'install': false,
+ },
+)
+
+
+regress_tests += {
+ 'name': 'main',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'schedule': files('parallel_schedule'),
+ 'regress_args': ['--make-testtablespace-dir'],
+ 'test_kwargs': {
+ 'priority': 50,
+ 'timeout': 1000,
+ },
+}
diff --git a/src/test/ssl/meson.build b/src/test/ssl/meson.build
new file mode 100644
index 00000000000..42e34c9f632
--- /dev/null
+++ b/src/test/ssl/meson.build
@@ -0,0 +1,10 @@
+tap_tests += {
+ 'name': 'ssl',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'env' : {'with_ssl': get_option('ssl')},
+ 'tests': [
+ 't/001_ssltests.pl',
+ 't/002_scram.pl'
+ ],
+}
diff --git a/src/test/subscription/meson.build b/src/test/subscription/meson.build
new file mode 100644
index 00000000000..31580edd3d3
--- /dev/null
+++ b/src/test/subscription/meson.build
@@ -0,0 +1,33 @@
+tap_tests += {
+ 'name': 'subscription',
+ 'sd': meson.current_source_dir(),
+ 'bd': meson.current_build_dir(),
+ 'env' : {'with_icu': icu.found() ? 'yes' : 'no'},
+ 'tests': [
+ 't/001_rep_changes.pl',
+ 't/002_types.pl',
+ 't/003_constraints.pl',
+ 't/004_sync.pl',
+ 't/005_encoding.pl',
+ 't/006_rewrite.pl',
+ 't/007_ddl.pl',
+ 't/008_diff_schema.pl',
+ 't/009_matviews.pl',
+ 't/010_truncate.pl',
+ 't/011_generated.pl',
+ 't/012_collation.pl',
+ 't/013_partition.pl',
+ 't/014_binary.pl',
+ 't/015_stream.pl',
+ 't/016_stream_subxact.pl',
+ 't/017_stream_ddl.pl',
+ 't/018_stream_subxact_abort.pl',
+ 't/019_stream_subxact_ddl_abort.pl',
+ 't/020_messages.pl',
+ 't/021_twophase.pl',
+ 't/022_twophase_cascade.pl',
+ 't/023_twophase_stream.pl',
+ 't/024_add_drop_pub.pl',
+ 't/100_bugs.pl',
+ ],
+}
diff --git a/src/timezone/meson.build b/src/timezone/meson.build
new file mode 100644
index 00000000000..c3703a5ec7d
--- /dev/null
+++ b/src/timezone/meson.build
@@ -0,0 +1,50 @@
+# files to build into backend
+timezone_sources = files(
+ 'localtime.c',
+ 'pgtz.c',
+ 'strftime.c',
+)
+
+
+timezone_inc = include_directories('.')
+
+timezone_localtime_source = files('localtime.c')
+
+# files needed to build zic utility program
+zic_sources = files(
+ 'zic.c'
+)
+
+# we now distribute the timezone data as a single file
+tzdata = files(
+ 'data/tzdata.zi'
+)
+
+
+# FIXME: For cross builds, it would need a native built libpgport/pgcommon to
+# build our zic. But for that we'd need to run a good chunk of the configure
+# tests both natively and cross. Unclear if it's worth it.
+if meson.is_cross_build()
+ zic = find_program('zic', native: true, required: false)
+else
+ zic = executable('zic', zic_sources,
+ dependencies: [frontend_code],
+ kwargs: default_bin_args + {'install': false}
+ )
+endif
+
+# FIXME: this used to be sorted - but also isn't actually used
+abbrevs_txt = custom_target('abbrevs.txt',
+ input: tzdata,
+ output: ['abbrevs.txt'],
+ command: [zic, '-P', '-b', 'fat', 'junkdir', '@INPUT@'],
+ capture: true)
+
+tzdata = custom_target('tzdata',
+ input: tzdata,
+ output: ['timezone'],
+ command: [zic, '-d', '@OUTPUT@', '@INPUT@'],
+ install: true,
+ install_dir: get_option('datadir'))
+
+subdir('tznames')
diff --git a/src/timezone/tznames/meson.build b/src/timezone/tznames/meson.build
new file mode 100644
index 00000000000..effd2880ce7
--- /dev/null
+++ b/src/timezone/tznames/meson.build
@@ -0,0 +1,20 @@
+tznames = files(
+ 'Africa.txt',
+ 'America.txt',
+ 'Antarctica.txt',
+ 'Asia.txt',
+ 'Atlantic.txt',
+ 'Australia.txt',
+ 'Etc.txt',
+ 'Europe.txt',
+ 'Indian.txt',
+ 'Pacific.txt',
+)
+
+tznames_sets = files(
+ 'Default',
+ 'Australia',
+ 'India')
+
+install_data(tznames, install_dir: get_option('datadir') / 'timezonesets')
+install_data(tznames_sets, install_dir: get_option('datadir') / 'timezonesets')
diff --git a/src/tools/find_meson b/src/tools/find_meson
new file mode 100755
index 00000000000..2d75537374e
--- /dev/null
+++ b/src/tools/find_meson
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import os
+import shlex
+import sys
+
+mesonintrospect = os.environ['MESONINTROSPECT']
+components = shlex.split(mesonintrospect)
+
+if len(components) < 2:
+ print(f'expected more, got: {components}')
+ sys.exit(1)
+
+if components[-1] != 'introspect':
+ print('expected introspection at the end')
+ sys.exit(1)
+
+print('\n'.join(components[:-1]), end='')
+
+sys.exit(0)
diff --git a/src/tools/irlink b/src/tools/irlink
new file mode 100644
index 00000000000..efc2c700277
--- /dev/null
+++ b/src/tools/irlink
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+srcdir="$1"
+builddir="$2"
+llvm_lto="$3"
+outputdir=$(realpath "$5")
+index="$outputdir/postgres.index.bc"
+priv="$6"
+shift 6
+numinput=$#
+
+if [ ! -d "$outputdir" ];then
+ mkdir -p "$outputdir/postgres"
+fi
+
+cd $priv
+
+# fixme, remove old contents"
+cp -r . "$outputdir/postgres"
+
+cd "$outputdir"
+
+filenames=$(for f in "$@";do echo "postgres/${f#$priv/}";done)
+"$llvm_lto" -thinlto -thinlto-action=thinlink -o "$index" $filenames
+
+exit 0
diff --git a/src/tools/msvc/export2def.pl b/src/tools/msvc/export2def.pl
new file mode 100644
index 00000000000..fb88e8b8ab9
--- /dev/null
+++ b/src/tools/msvc/export2def.pl
@@ -0,0 +1,22 @@
+# Copyright (c) 2021, PostgreSQL Global Development Group
+
+use strict;
+use warnings;
+use 5.8.0;
+use List::Util qw(max);
+
+my ($deffile, $txtfile, $libname) = @ARGV;
+
+print STDERR "Generating $deffile...\n";
+open(my $if, '<', $txtfile) || die("Could not open $txtfile\n");
+open(my $of, '>', $deffile) || die("Could not open $deffile for writing\n");
+print $of "LIBRARY $libname\nEXPORTS\n";
+while (<$if>)
+{
+ next if (/^#/);
+ next if (/^\s*$/);
+ my ($f, $o) = split;
+ print $of " $f @ $o\n";
+}
+close($of);
+close($if);
diff --git a/src/tools/msvc/gendef2.pl b/src/tools/msvc/gendef2.pl
new file mode 100644
index 00000000000..3b905d6f5da
--- /dev/null
+++ b/src/tools/msvc/gendef2.pl
@@ -0,0 +1,177 @@
+
+# Copyright (c) 2021, PostgreSQL Global Development Group
+
+use strict;
+use warnings;
+use 5.8.0;
+use List::Util qw(max);
+
+my @def;
+
+#
+# Script that generates a .DEF file for all objects in a directory
+#
+# src/tools/msvc/gendef.pl
+#
+
+# Given a symbol file path, loops over its contents
+# and returns a list of symbols of interest as a dictionary
+# of 'symbolname' -> symtype, where symtype is:
+#
+# 0 a CODE symbol, left undecorated in the .DEF
+# 1 A DATA symbol, i.e. global var export
+#
+sub extract_syms
+{
+ my ($symfile, $def) = @_;
+ open(my $f, '<', $symfile) || die "Could not open $symfile: $!\n";
+ while (<$f>)
+ {
+
+ # Expected symbol lines look like:
+ #
+ # 0 1 2 3 4 5 6
+ # IDX SYMBOL SECT SYMTYPE SYMSTATIC SYMNAME
+ # ------------------------------------------------------------------------
+ # 02E 00000130 SECTA notype External | _standbyState
+ # 02F 00000009 SECT9 notype Static | _LocalRecoveryInProgress
+ # 064 00000020 SECTC notype () Static | _XLogCheckBuffer
+ # 065 00000000 UNDEF notype () External | _BufferGetTag
+ #
+ # See http://msdn.microsoft.com/en-us/library/b842y285.aspx
+ #
+ # We're not interested in the symbol index or offset.
+ #
+ # SECT[ION] is only examined to see whether the symbol is defined in a
+ # COFF section of the local object file; if UNDEF, it's a symbol to be
+ # resolved at link time from another object so we can't export it.
+ #
+ # SYMTYPE is always notype for C symbols as there's no typeinfo and no
+ # way to get the symbol type from name (de)mangling. However, we care
+ # if "notype" is suffixed by "()" or not. The presence of () means the
+ # symbol is a function, the absence means it isn't.
+ #
+ # SYMSTATIC indicates whether it's a compilation-unit local "static"
+ # symbol ("Static"), or whether it's available for use from other
+ # compilation units ("External"). We export all symbols that aren't
+ # static as part of the whole program DLL interface to produce UNIX-like
+ # default linkage.
+ #
+ # SYMNAME is, obviously, the symbol name. The leading underscore
+ # indicates that the _cdecl calling convention is used. See
+ # http://www.unixwiz.net/techtips/win32-callconv.html
+ # http://www.codeproject.com/Articles/1388/Calling-Conventions-Demystified
+ #
+ s/notype \(\)/func/g;
+ s/notype/data/g;
+
+ my @pieces = split;
+
+ # Skip file and section headers and other non-symbol entries
+ next unless defined($pieces[0]) and $pieces[0] =~ /^[A-F0-9]{3,}$/;
+
+ # Skip blank symbol names
+ next unless $pieces[6];
+
+ # Skip externs used from another compilation unit
+ next if ($pieces[2] eq "UNDEF");
+
+ # Skip static symbols
+ next unless ($pieces[4] eq "External");
+
+ # Skip some more MSVC-generated crud
+ next if $pieces[6] =~ /^@/;
+ next if $pieces[6] =~ /^\(/;
+
+ # __real and __xmm are out-of-line floating point literals and
+ # (for __xmm) their SIMD equivalents. They shouldn't be part
+ # of the DLL interface.
+ next if $pieces[6] =~ /^__real/;
+ next if $pieces[6] =~ /^__xmm/;
+
+ # __imp entries are imports from other DLLs, eg __imp__malloc .
+ # (We should never have one of these that hasn't already been skipped
+ # by the UNDEF test above, though).
+ next if $pieces[6] =~ /^__imp/;
+
+ # More under-documented internal crud
+ next if $pieces[6] =~ /NULL_THUNK_DATA$/;
+ next if $pieces[6] =~ /^__IMPORT_DESCRIPTOR/;
+ next if $pieces[6] =~ /^__NULL_IMPORT/;
+
+ # Skip string literals
+ next if $pieces[6] =~ /^\?\?_C/;
+
+ # We assume that if a symbol is defined as data, then as a function,
+ # the linker will reject the binary anyway. So it's OK to just pick
+ # whatever came last.
+ $def->{ $pieces[6] } = $pieces[3];
+ }
+ close($f);
+ return;
+}
+
+sub writedef
+{
+ my ($deffile, $platform, $def) = @_;
+ open(my $fh, '>', $deffile) || die "Could not write to $deffile\n";
+ print $fh "EXPORTS\n";
+ foreach my $f (sort keys %{$def})
+ {
+ my $isdata = $def->{$f} eq 'data';
+
+ # Strip the leading underscore for win32, but not x64
+ $f =~ s/^_//
+ unless ($platform eq "x64");
+
+ # Emit just the name if it's a function symbol, or emit the name
+ # decorated with the DATA option for variables.
+ if ($isdata)
+ {
+ print $fh " $f DATA\n";
+ }
+ else
+ {
+ print $fh " $f\n";
+ }
+ }
+ close($fh);
+ return;
+}
+
+
+sub usage
+{
+ die( "Usage: gendef.pl platform outputfile tempdir sourcelib\n"
+ . " modulepath: path to dir with obj files, no trailing slash"
+ . " platform: Win32 | x64");
+}
+
+usage()
+ unless scalar(@ARGV) >= 4;
+
+my $platform = $ARGV[0];
+shift;
+my $deffile = $ARGV[0];
+shift;
+my $tempdir = $ARGV[0];
+shift;
+
+print STDERR "Generating $deffile in tmp dir $tempdir from ".join(' ', @ARGV)."\n";
+
+my %def = ();
+
+my $symfile = "$tempdir/all.sym";
+my $tmpfile = "$tempdir/tmp.sym";
+mkdir($tempdir);
+print STDERR "dumpbin /symbols /out:$tmpfile ".join(' ', @ARGV)."\n";
+system("dumpbin /symbols /out:$tmpfile ".join(' ', @ARGV))
+ && die "Could not call dumpbin";
+rename($tmpfile, $symfile);
+print "generated symfile to $symfile (via $tmpfile)\n";
+extract_syms($symfile, \%def);
+print "\n";
+
+writedef($deffile, $platform, \%def);
+
+print "Generated " . scalar(keys(%def)) . " symbols\n";
diff --git a/src/tools/testwrap b/src/tools/testwrap
new file mode 100755
index 00000000000..aeb2019b099
--- /dev/null
+++ b/src/tools/testwrap
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# FIXME: I should probably be a perl or python script
+#
+
+# FIXME: argument parsing
+
+basedir=$1
+builddir=$2
+testgroup=$3
+testname=$(basename -s .pl $4)
+shift 4
+
+testdir="$basedir/testrun/$testgroup/$testname"
+echo "# executing test in $testdir group $testgroup test $testname, builddir $builddir"
+rm -rf "$testdir/"
+mkdir -p "$testdir"
+
+export TESTOUTDIR="$testdir"
+export TESTDIR="$builddir"
+
+exec "$@"
--
2.23.0.385.gbc12974a89
v3-0017-ci-Build-both-with-meson-and-as-before.patch (text/x-diff, 17.8K) download
From 6567a246b7c98bf769b15f4544fb039d162dbe38 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Fri, 8 Oct 2021 17:29:10 -0700
Subject: [PATCH v3 17/17] ci: Build both with meson and as before.
---
.cirrus.yml | 464 ++++++++++++++++++++++++++++++++++------------------
1 file changed, 308 insertions(+), 156 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index f75bdce6dec..eace4602ea3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,14 +13,13 @@ env:
task:
- name: FreeBSD
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*freebsd.*'
compute_engine_instance:
image_project: pg-vm-images-aio
image: family/pg-aio-freebsd-13-0
platform: freebsd
- cpu: 2
- memory: 2G
+ cpu: 4
+ memory: 4G
disk: 50
env:
CCACHE_DIR: "/tmp/ccache_dir"
@@ -39,33 +38,52 @@ task:
- mkdir -p /tmp/ccache_dir
- chown -R postgres:postgres /tmp/ccache_dir
- configure_script: |
- su postgres -c './configure \
- --enable-cassert --enable-debug --enable-tap-tests \
- --enable-nls \
- \
- --with-icu \
- --with-ldap \
- --with-libxml \
- --with-libxslt \
- \
- --with-lz4 \
- --with-pam \
- --with-perl \
- --with-python \
- --with-ssl=openssl \
- --with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \
- --with-uuid=bsd \
- \
- --with-includes=/usr/local/include --with-libs=/usr/local/lib \
- CC="ccache cc"'
- build_script:
- - su postgres -c 'gmake -s -j3 && gmake -s -j3 -C contrib'
- upload_caches:
- - ccache
+ matrix:
+ - name: FreeBSD autoconf
+
+ configure_script: |
+ su postgres -c './configure \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ \
+ --with-lz4 \
+ --with-pam \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \
+ --with-uuid=bsd \
+ \
+ --with-includes=/usr/local/include --with-libs=/usr/local/lib \
+ CC="ccache cc"'
+ build_script:
+ - su postgres -c 'gmake -s -j4 && gmake -s -j4 -C contrib'
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - su postgres -c 'time gmake -s -j4 ${CHECK} ${CHECKFLAGS}'
+
+ - name: FreeBSD meson
+
+ configure_script:
+ - su postgres -c 'meson setup --buildtype debug -Dcassert=true -Dssl=openssl build'
+ build_script:
+ - su postgres -c 'ninja -C build'
+ upload_caches:
+ - ccache
+ run_tests_script:
+ - su postgres -c 'meson test --no-rebuild -C build'
- tests_script:
- - su postgres -c 'time gmake -s -j2 ${CHECK} ${CHECKFLAGS}'
+ always:
+ meson_log_artifacts:
+ path: "build/meson-logs/*.txt"
+ type: text/plain
on_failure:
cores_script: |
@@ -83,14 +101,16 @@ task:
tap_artifacts:
path: "**/regress_log_*"
type: text/plain
+ meson_test_artifacts:
+ path: "build/meson-logs/testlog.junit.xml"
+ type: text/xml
+ format: junit
task:
- name: Linux
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*linux.*'
compute_engine_instance:
image_project: pg-vm-images-aio
- image: family/pg-aio-bullseye
platform: linux
cpu: 4
memory: 2G
@@ -120,37 +140,78 @@ task:
- su postgres -c 'ulimit -l -S'
- echo '/tmp/%e-%s-%p.core' > /proc/sys/kernel/core_pattern
- configure_script: |
- su postgres -c './configure \
- --enable-cassert --enable-debug --enable-tap-tests \
- --enable-nls \
- \
- --with-gssapi \
- --with-icu \
- --with-ldap \
- --with-libxml \
- --with-libxslt \
- --with-llvm \
- --with-lz4 \
- --with-pam \
- --with-perl \
- --with-python \
- --with-ssl=openssl \
- --with-systemd \
- --with-tcl --with-tclconfig=/usr/lib/tcl8.6/ \
- --with-uuid=e2fs \
- \
- CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" CFLAGS="-O0 -ggdb"'
- build_script:
- - su postgres -c 'make -s -j4 && make -s -j4 -C contrib'
- upload_caches:
- - ccache
+ matrix:
+ - name: Linux Autoconf
+
+ compute_engine_instance:
+ image: family/pg-aio-bullseye
+
+ configure_script: |
+ su postgres -c './configure \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-gssapi \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ --with-llvm \
+ --with-lz4 \
+ --with-pam \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-systemd \
+ --with-tcl --with-tclconfig=/usr/lib/tcl8.6/ \
+ --with-uuid=e2fs \
+ \
+ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" CFLAGS="-O0 -ggdb"'
+ build_script:
+ - su postgres -c 'make -s -j4 && make -s -j4 -C contrib'
+ upload_caches:
+ - ccache
+
+ tests_script: |
+ su postgres -c '\
+ ulimit -c unlimited; \
+ make -s ${CHECK} ${CHECKFLAGS} -j8 \
+ '
+
+ - name: Linux Meson
+
+ compute_engine_instance:
+ image: family/pg-aio-bullseye
+
+ configure_script:
+ - su postgres -c 'meson setup --buildtype debug -Dcassert=true -Dssl=openssl build'
+ build_script:
+ - su postgres -c 'ninja -C build'
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - su postgres -c 'meson test --no-rebuild -C build'
+
+ - name: Linux Meson Sid
+
+ compute_engine_instance:
+ image: family/pg-aio-sid
+
+ configure_script:
+ - su postgres -c 'meson setup --buildtype debug -Dcassert=true -Dssl=openssl build'
+ build_script:
+ - su postgres -c 'ninja -C build'
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - su postgres -c 'meson test --no-rebuild -C build'
- tests_script: |
- su postgres -c '\
- ulimit -c unlimited; \
- make -s ${CHECK} ${CHECKFLAGS} -j8 \
- '
+ always:
+ meson_log_artifacts:
+ path: "build/meson-logs/*.txt"
+ type: text/plain
on_failure:
cores_script: |
@@ -168,10 +229,13 @@ task:
tap_artifacts:
path: "**/regress_log_*"
type: text/plain
+ meson_test_artifacts:
+ path: "build/meson-logs/testlog.junit.xml"
+ type: text/xml
+ format: junit
task:
- name: macOS
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*(macos|darwin|osx).*'
osx_instance:
image: big-sur-base
@@ -201,55 +265,86 @@ task:
- sudo chmod 777 /cores
homebrew_install_script:
- brew install make coreutils ccache icu4c lz4 tcl-tk openldap
+ - brew install meson ninja python@3.9
upload_caches:
- homebrew
- configure_script: |
- LIBS="/usr/local/lib:$LIBS"
- INCLUDES="/usr/local/include:$INCLUDES"
-
- INCLUDES="/usr/local/opt/openssl/include:$INCLUDES"
- LIBS="/usr/local/opt/openssl/lib:$LIBS"
-
- PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
- INCLUDES="/usr/local/opt/icu4c/include:$INCLUDES"
- LIBS="/usr/local/opt/icu4c/lib:$LIBS"
-
- LIBS="/usr/local/opt/openldap/lib:$LIBS"
- INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
-
- export PKG_CONFIG_PATH
-
- ./configure \
- --prefix=$HOME/install \
- --with-includes="$INCLUDES" \
- --with-libs="$LIBS" \
- \
- --enable-cassert --enable-debug --enable-tap-tests \
- --enable-nls \
- \
- --with-icu \
- --with-ldap \
- --with-libxml \
- --with-libxslt \
- \
- --with-lz4 \
- --with-perl \
- --with-python \
- --with-ssl=openssl \
- --with-tcl --with-tclconfig=/usr/local/opt/tcl-tk/lib/ \
- --with-uuid=e2fs \
- \
- CC="ccache gcc" CFLAGS="-O0 -ggdb"
- build_script:
- - gmake -s -j12 && gmake -s -j12 -C contrib
- upload_caches:
- - ccache
+ matrix:
+ - name: macOS autoconf
+
+ configure_script: |
+ LIBS="/usr/local/lib:$LIBS"
+ INCLUDES="/usr/local/include:$INCLUDES"
+
+ PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ INCLUDES="/usr/local/opt/openssl/include:$INCLUDES"
+ LIBS="/usr/local/opt/openssl/lib:$LIBS"
+
+ PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
+ INCLUDES="/usr/local/opt/icu4c/include:$INCLUDES"
+ LIBS="/usr/local/opt/icu4c/lib:$LIBS"
+
+ PKG_CONFIG_PATH="/usr/local/opt/ldap/lib/pkgconfig:$PKG_CONFIG_PATH"
+ LIBS="/usr/local/opt/openldap/lib:$LIBS"
+ INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
+
+ export PKG_CONFIG_PATH
+
+ ./configure \
+ --prefix=$HOME/install \
+ --with-includes="$INCLUDES" \
+ --with-libs="$LIBS" \
+ \
+ --enable-cassert --enable-debug --enable-tap-tests \
+ --enable-nls \
+ \
+ --with-icu \
+ --with-ldap \
+ --with-libxml \
+ --with-libxslt \
+ \
+ --with-lz4 \
+ --with-perl \
+ --with-python \
+ --with-ssl=openssl \
+ --with-tcl --with-tclconfig=/usr/local/opt/tcl-tk/lib/ \
+ --with-uuid=e2fs \
+ \
+ CC="ccache gcc" CFLAGS="-O0 -ggdb"
+ build_script:
+ - gmake -s -j12 && gmake -s -j12 -C contrib
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - ulimit -c unlimited
+ - ulimit -n 1024
+ - gmake -s -j12 ${CHECK} ${CHECKFLAGS}
+
+ - name: macOS meson
+
+ configure_script: |
+ PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/opt/openldap/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+ export PKG_CONFIG_PATH
+
+ meson setup --buildtype debug -Dcassert=true -Dssl=openssl build
+ build_script:
+ - ninja -C build
+ upload_caches:
+ - ccache
+
+ tests_script:
+ - ulimit -c unlimited
+ - ulimit -n 1024
+ - meson test --no-rebuild -C build
- tests_script:
- - ulimit -c unlimited
- - ulimit -n 1024
- - gmake -s -j12 ${CHECK} ${CHECKFLAGS}
+ always:
+ meson_log_artifacts:
+ path: "build/meson-logs/*.txt"
+ type: text/plain
on_failure:
cores_script: |
@@ -265,10 +360,13 @@ task:
tap_artifacts:
path: "**/regress_log_*"
type: text/plain
+ meson_test_artifacts:
+ path: "build/meson-logs/testlog.junit.xml"
+ type: text/xml
+ format: junit
task:
- name: Windows
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
windows_container:
dockerfile: ci/docker/windows_vs_2019
@@ -281,6 +379,8 @@ task:
TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/ci/pg_ci_base.conf
# Avoid re-installing over and over
NO_TEMP_INSTALL: 1
+ # Try to hide git's tar
+ PATH: c:\windows\system32;${PATH}
sysinfo_script:
- chcp
@@ -289,55 +389,103 @@ task:
- ps: Get-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug'
- set
- configure_script:
- - copy ci\windows_build_config.pl src\tools\msvc\config.pl
- - vcvarsall x64
- - perl src/tools/msvc/mkvcbuild.pl
- build_script:
- - vcvarsall x64
- # Disable file tracker, we're never going to rebuild...
- - msbuild -m /p:TrackFileAccess=false pgsql.sln
- tempinstall_script:
- # Installation on windows currently only completely works from src\tools\msvc
- - cd src\tools\msvc && perl .\install.pl %CIRRUS_WORKING_DIR%\tmp_install
-
- check_test_script:
- - perl src/tools/msvc/vcregress.pl check parallel
- startcreate_test_script:
- - tmp_install\bin\pg_ctl.exe initdb -D tmp_check\db -l tmp_check\initdb.log
- - echo include '%TEMP_CONFIG%' >> tmp_check\db\postgresql.conf
- - tmp_install\bin\pg_ctl.exe start -D tmp_check\db -l tmp_check\postmaster.log
- plcheck_test_script:
- - perl src/tools/msvc/vcregress.pl plcheck
- isolationcheck_test_script:
- - perl src/tools/msvc/vcregress.pl isolationcheck
- modulescheck_test_script:
- - perl src/tools/msvc/vcregress.pl modulescheck
- contribcheck_test_script:
- - perl src/tools/msvc/vcregress.pl contribcheck
- stop_test_script:
- - tmp_install\bin\pg_ctl.exe stop -D tmp_check\db -l tmp_check\postmaster.log
- ssl_test_script:
- - set with_ssl=openssl
- - perl src/tools/msvc/vcregress.pl taptest .\src\test\ssl\
- subscriptioncheck_test_script:
- - perl src/tools/msvc/vcregress.pl taptest .\src\test\subscription\
- authentication_test_script:
- - perl src/tools/msvc/vcregress.pl taptest .\src\test\authentication\
- recoverycheck_test_script:
- - perl src/tools/msvc/vcregress.pl recoverycheck
- bincheck_test_script:
- - perl src/tools/msvc/vcregress.pl bincheck
- upgradecheck_test_script:
- - perl src/tools/msvc/vcregress.pl upgradecheck
- ecpgcheck_test_script:
- # tries to build additional stuff
- - vcvarsall x64
- # References ecpg_regression.proj in the current dir
- - cd src\tools\msvc
- - perl vcregress.pl ecpgcheck
+ matrix:
+ - name: Windows homegrowns
+
+ configure_script:
+ - copy ci\windows_build_config.pl src\tools\msvc\config.pl
+ - vcvarsall x64
+ - perl src/tools/msvc/mkvcbuild.pl
+ build_script:
+ - vcvarsall x64
+ # Disable file tracker, we're never going to rebuild...
+ - msbuild -m /p:TrackFileAccess=false pgsql.sln
+ tempinstall_script:
+ # Installation on windows currently only completely works from src\tools\msvc
+ - cd src\tools\msvc && perl .\install.pl %CIRRUS_WORKING_DIR%\tmp_install
+
+ check_test_script:
+ - perl src/tools/msvc/vcregress.pl check parallel
+ startcreate_test_script:
+ - tmp_install\bin\pg_ctl.exe initdb -D tmp_check\db -l tmp_check\initdb.log
+ - echo include '%TEMP_CONFIG%' >> tmp_check\db\postgresql.conf
+ - tmp_install\bin\pg_ctl.exe start -D tmp_check\db -l tmp_check\postmaster.log
+ plcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl plcheck
+ isolationcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl isolationcheck
+ modulescheck_test_script:
+ - perl src/tools/msvc/vcregress.pl modulescheck
+ contribcheck_test_script:
+ - perl src/tools/msvc/vcregress.pl contribcheck
+ stop_test_script:
+ - tmp_install\bin\pg_ctl.exe stop -D tmp_check\db -l tmp_check\postmaster.log
+ ssl_test_script:
+ - set with_ssl=openssl
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\ssl\
+ subscriptioncheck_test_script:
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\subscription\
+ authentication_test_script:
+ - perl src/tools/msvc/vcregress.pl taptest .\src\test\authentication\
+ recoverycheck_test_script:
+ - perl src/tools/msvc/vcregress.pl recoverycheck
+ bincheck_test_script:
+ - perl src/tools/msvc/vcregress.pl bincheck
+ upgradecheck_test_script:
+ - perl src/tools/msvc/vcregress.pl upgradecheck
+ ecpgcheck_test_script:
+ # tries to build additional stuff
+ - vcvarsall x64
+ # References ecpg_regression.proj in the current dir
+ - cd src\tools\msvc
+ - perl vcregress.pl ecpgcheck
+
+ - name: Windows Meson+vs+Ninja
+
+ meson_script:
+ - pip install meson
+ - pip install ninja
+ configure_script:
+ - vcvarsall x64
+ - mkdir subprojects
+ - meson wrap install lz4
+ - meson wrap install zlib
+ - meson setup --buildtype debug --backend ninja -Dcassert=true -Db_pch=true -Dssl=openssl -Dlz4=enabled -Dzlib=enabled -Dextra_lib_dirs=c:\openssl\1.1.1l\lib -Dextra_include_dirs=c:\openssl\1.1.1l\include build
+ build_script:
+ - vcvarsall x64
+ - ninja -C build
+
+ check_script:
+ - vcvarsall x64
+ - meson test --no-rebuild -C build
+
+ - name: Windows Meson+vs+msbuild
+
+ # Need a development version of meson for now
+ meson_dev_script:
+ - git clone https://github.com/mesonbuild/meson.git
+
+ configure_script:
+ - vcvarsall x64
+ - mkdir subprojects
+ - .\meson\meson.py wrap install lz4
+ - .\meson\meson.py wrap install zlib
+ - .\meson\meson.py setup --buildtype debug --backend vs -Dcassert=true -Db_pch=true -Dssl=openssl -Dlz4=enabled -Dzlib=enabled -Dextra_lib_dirs=c:\openssl\1.1.1l\lib -Dextra_include_dirs=c:\openssl\1.1.1l\include build
+
+ build_script:
+ - vcvarsall x64
+ - msbuild -m /p:UseMultiToolTask=true build\postgresql.sln
+
+ check_script:
+ - vcvarsall x64
+ - .\meson\meson.py test --no-rebuild -C build
always:
+ meson_log_artifacts:
+ path: "build/meson-logs/*.txt"
+ type: text/plain
+ cat_dumps_script:
+
cores_script:
- cat crashlog.txt || true
dump_artifacts:
@@ -354,12 +502,16 @@ task:
tap_artifacts:
path: "**/regress_log_*"
type: text/plain
+ meson_test_artifacts:
+ path: "build/meson-logs/testlog.junit.xml"
+ type: text/xml
+ format: junit
task:
name: CompilerWarnings
depends_on:
- - Linux
+ - Linux Autoconf
# task that did not run count as a success, so we need to recheck Linux' condition here :/
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*linux.*'
container:
--
2.23.0.385.gbc12974a89
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 09:08 ` Andres Freund <andres@anarazel.de>
2022-03-09 17:13 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
11 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 09:08 UTC (permalink / raw)
To: pgsql-hackers
Hi,
On 2021-10-12 01:37:21 -0700, Andres Freund wrote:
> non-cached build (world-bin):
> current: 40.46s
> ninja: 7.31s
Interestingly this is pretty close to the minimum achievable on my
machine from the buildsystem perspective.
A build with -fuse-ld=lld, which the above didn't use, takes 6.979s. The
critical path is
bison gram.y -> gram.c 4.13s
gcc gram.c -> gram.o 2.05s
gcc postgres .... 0.317
A very helpful visualization is to transform ninja's build logs into a
tracefile with https://github.com/nico/ninjatracing
I attached an example - the trace.json.gz can be uploaded as-is to
https://ui.perfetto.dev/
It's quite a bit of of fun to look at imo.
There's a few other things quickly apparent:
- genbki prevents build progress due to dependencies on the generated
headers.
- the absolutely stupid way I implemented the python2->python3
regression test output conversion uses up a fair bit of resources
- tablecmds.c, pg_dump.c, xlog.c and a few other files are starting to
big enough to be problematic compile-time wise
Greetings,
Andres Freund
Attachments:
trace.json.gz (application/gzip, 23.6K) download
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 09:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-03-09 17:13 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-03-09 17:13 UTC (permalink / raw)
To: pgsql-hackers; +Cc: John Naylor <john.naylor@enterprisedb.com>
Hi,
On 2021-10-12 02:08:29 -0700, Andres Freund wrote:
> A very helpful visualization is to transform ninja's build logs into a
> tracefile with https://github.com/nico/ninjatracing
>
> I attached an example - the trace.json.gz can be uploaded as-is to
> https://ui.perfetto.dev/
These days perfetto can load .ninja_log directly without conversion. Attached
is an example of the output. Also attached a local .ninja_log to upload if
somebody wants to look at the interactive output without building.
> It's quite a bit of of fun to look at imo.
>
> There's a few other things quickly apparent:
>
> - genbki prevents build progress due to dependencies on the generated
> headers.
That's still the biggest "slowdown". Only a small number of things can start
before genbki is done. Parts of pgport, bison/flex and parts of the docs
build.
> - the absolutely stupid way I implemented the python2->python3
> regression test output conversion uses up a fair bit of resources
That's gone now.
> - tablecmds.c, pg_dump.c, xlog.c and a few other files are starting to
> big enough to be problematic compile-time wise
But these are still present. When building just the backend, the build speed
is limited by gram.y->gram.c, gram.c -> gram.o, linking postgres.
Greetings,
Andres Freund
Attachments:
build-log.png (image/png, 1002.2K) download
view image
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 13:30 ` Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 15:00 ` Re: [RFC] building postgres with meson Robert Haas <robertmhaas@gmail.com>
2021-10-12 16:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
11 siblings, 2 replies; 143+ messages in thread
From: Peter Eisentraut @ 2021-10-12 13:30 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; pgsql-hackers
On 12.10.21 10:37, Andres Freund wrote:
> For the last year or so I've on and off tinkered with $subject. I think
> it's in a state worth sharing now. First, let's look at a little
> comparison.
I played with $subject a few years ago and liked it. I think, like you
said, meson is the best way forward. I support this project.
One problem I noticed back then was that some choices that we currently
determine ourselves in configure or the makefiles are hardcoded in
meson. For example, at the time, gcc on macOS was not supported. Meson
thought, if you are on macOS, you are surely using the Apple compiler,
and it supports these options. Fixing that required patches deep in the
bowels of the meson source code (and, in practice, waiting for a new
release etc.). I strongly suspect this isn't the only such problem.
For example, the shared library build behavior has been carefully tuned
in opinionated ways. With the autotools chain, one can override
anything with enough violence; so we have always felt free to do that.
I haven't followed it in a while, so I don't know what the situation is
now; but it is a concern, because we have always felt free to try new
and unusual build tools (Sun compiler, Intel compiler,
clang-when-it-was-new) early without waiting for anyone else.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
@ 2021-10-12 15:00 ` Robert Haas <robertmhaas@gmail.com>
2021-10-12 15:47 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: Robert Haas @ 2021-10-12 15:00 UTC (permalink / raw)
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
On Tue, Oct 12, 2021 at 9:31 AM Peter Eisentraut
<peter.eisentraut@enterprisedb.com> wrote:
> One problem I noticed back then was that some choices that we currently
> determine ourselves in configure or the makefiles are hardcoded in
> meson. For example, at the time, gcc on macOS was not supported. Meson
> thought, if you are on macOS, you are surely using the Apple compiler,
> and it supports these options. Fixing that required patches deep in the
> bowels of the meson source code (and, in practice, waiting for a new
> release etc.). I strongly suspect this isn't the only such problem.
> For example, the shared library build behavior has been carefully tuned
> in opinionated ways. With the autotools chain, one can override
> anything with enough violence; so we have always felt free to do that.
> I haven't followed it in a while, so I don't know what the situation is
> now; but it is a concern, because we have always felt free to try new
> and unusual build tools (Sun compiler, Intel compiler,
> clang-when-it-was-new) early without waiting for anyone else.
I think we're going to need some solution to this problem. We have too
many people here with strong opinions about questions like this for me
to feel good about the idea that we're going to collectively be OK
with leaving these sorts of decisions up to some other project.
From my point of view, the time it takes to run configure is annoying,
but the build time is pretty fine. On my system, configure takes about
33 seconds, and a full rebuild with 'make -j8' takes 14.5 seconds (I
am using ccache). Moreover, most of the time when I run make, I'm only
doing a partial rebuild, so it's near-instantaneous.
--
Robert Haas
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 15:00 ` Re: [RFC] building postgres with meson Robert Haas <robertmhaas@gmail.com>
@ 2021-10-12 15:47 ` Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 0 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-12 15:47 UTC (permalink / raw)
To: Robert Haas <robertmhaas@gmail.com>; +Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; Andres Freund <andres@anarazel.de>; pgsql-hackers
Robert Haas <robertmhaas@gmail.com> writes:
> I think we're going to need some solution to this problem. We have too
> many people here with strong opinions about questions like this for me
> to feel good about the idea that we're going to collectively be OK
> with leaving these sorts of decisions up to some other project.
Agreed. I'm willing to put up with the costs of moving to some
other build system, but not if it dictates choices we don't want to
make about the end products.
> From my point of view, the time it takes to run configure is annoying,
> but the build time is pretty fine. On my system, configure takes about
> 33 seconds, and a full rebuild with 'make -j8' takes 14.5 seconds (I
> am using ccache). Moreover, most of the time when I run make, I'm only
> doing a partial rebuild, so it's near-instantaneous.
Read about Autoconf's --cache-file option. That and ccache are
absolutely essential tools IMO.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
@ 2021-10-12 16:15 ` Andres Freund <andres@anarazel.de>
2021-10-12 19:01 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 16:15 UTC (permalink / raw)
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 15:30:57 +0200, Peter Eisentraut wrote:
> I played with $subject a few years ago and liked it. I think, like you
> said, meson is the best way forward. I support this project.
Cool.
> One problem I noticed back then was that some choices that we currently
> determine ourselves in configure or the makefiles are hardcoded in meson.
Yea, there's some of that. I think some degree of reduction in flexibility is
needed to realistically target multiple "backend" build-system like visual
studio project files etc. but I wish there were a bit less of that
nonetheless.
> For example, at the time, gcc on macOS was not supported. Meson thought, if
> you are on macOS, you are surely using the Apple compiler, and it supports
> these options.
I'm pretty sure this one now can just be overridden with CC=gcc. It can on
linux and windows, but I don't have ready interactive access with a mac
(leaving cirrus asside, which now has a "start a terminal" option...).
> For example, the shared library build behavior has been carefully tuned in
> opinionated ways. With the autotools chain, one can override anything with
> enough violence; so we have always felt free to do that. I haven't followed
> it in a while, so I don't know what the situation is now; but it is a
> concern, because we have always felt free to try new and unusual build tools
> (Sun compiler, Intel compiler, clang-when-it-was-new) early without waiting
> for anyone else.
It's possible to just take over building e.g. shared libraries ourselves with
custom targets. Although it'd be a bit annoying to do. The bigger problem is
that that e.g. wouldn't play that nicely with generating visual studio
projects, which require to generate link steps in a certain way. It'd build,
but the GUI might loose some of its options. Etc.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 16:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 19:01 ` Andres Freund <andres@anarazel.de>
2021-10-13 11:54 ` Re: [RFC] building postgres with meson Daniel Gustafsson <daniel@yesql.se>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 19:01 UTC (permalink / raw)
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 09:15:41 -0700, Andres Freund wrote:
> > For example, at the time, gcc on macOS was not supported. Meson thought, if
> > you are on macOS, you are surely using the Apple compiler, and it supports
> > these options.
>
> I'm pretty sure this one now can just be overridden with CC=gcc. It can on
> linux and windows, but I don't have ready interactive access with a mac
> (leaving cirrus asside, which now has a "start a terminal" option...).
It was a tad more complicated. But only because it took me a while to figure
out how to make gcc on macos actually work, independent of meson. Initially
gcc was always failing with errors about not finding the linker, and
installing binutils was a dead end.
Turns out just using a gcc at a specific path doesn't work, it ends up using
wrong internal binaries or something like that.
Once I got to that, the meson part was easy:
$ export PATH="/usr/local/opt/gcc/bin:$PATH"
$ CC=gcc-11 meson setup build-gcc
...
C compiler for the host machine: gcc-11 (gcc 11.2.0 "gcc-11 (Homebrew GCC 11.2.0) 11.2.0")
...
$ cd build-gcc
$ ninja test
...
181/181 postgresql:tap+subscription / subscription/t/100_bugs.pl OK 17.83s 5 subtests passed
Ok: 180
Expected Fail: 0
Fail: 0
Unexpected Pass: 0
Skipped: 1
Timeout: 0
One thing that is nice with meson's testrunner is that it can parse the output
of tap tests and recognizes the number of completed / failed subtests. I
wonder whether we could make pg_regress' output tap compliant without the
output quality suffering too much.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 16:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:01 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 11:54 ` Daniel Gustafsson <daniel@yesql.se>
2022-02-21 16:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Daniel Gustafsson @ 2021-10-13 11:54 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; pgsql-hackers
> On 12 Oct 2021, at 21:01, Andres Freund <andres@anarazel.de> wrote:
> One thing that is nice with meson's testrunner is that it can parse the output
> of tap tests and recognizes the number of completed / failed subtests. I
> wonder whether we could make pg_regress' output tap compliant without the
> output quality suffering too much.
I added a --tap option for TAP output to pg_regress together with Jinbao Chen
for giggles and killing some time a while back. It's not entirely done and
sort of PoC, but most of it works. Might not be of interest here, but in case
it is I've refreshed it slightly and rebased it. There might be better ways to
do it, but the aim was to make the diff against the guts of pg_regress small
and instead extract output functions for the different formats.
It omits the test timings, but that could be added either as a diagnostic line
following each status or as a YAML block in TAP 13 (the attached is standard
TAP, not version 13 but the change would be trivial).
If it's helpful and there's any interest for this I'm happy to finish it up now.
One thing that came out of this, is that we don't really handle the ignored
tests in the way the code thinks it does for normal output, the attached treats
ignored tests as SKIP tests.
--
Daniel Gustafsson https://vmware.com/
Attachments:
pg_regress_tap.diff (application/octet-stream, 14.1K) download
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 05296f7ee1..dc60edf82e 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -95,6 +95,7 @@ static char *dlpath = PKGLIBDIR;
static char *user = NULL;
static _stringlist *extraroles = NULL;
static char *config_auth_datadir = NULL;
+static bool tap = false;
/* internal variables */
static const char *progname;
@@ -120,9 +121,71 @@ static int fail_ignore_count = 0;
static bool directory_exists(const char *dir);
static void make_directory(const char *dir);
-static void header(const char *fmt,...) pg_attribute_printf(1, 2);
+struct output_func
+{
+ void (*header)(const char *line);
+ void (*footer)(const char *difffilename, const char *logfilename);
+ void (*comment)(const char *comment);
+
+ void (*test_status_preamble)(const char *testname);
+
+ void (*test_status_ok)(const char *testname);
+ void (*test_status_failed)(const char *testname);
+ void (*test_status_ignored)(const char *testname);
+
+ void (*test_runtime)(const char *testname, double runtime);
+};
+
+
+void (*test_runtime)(const char *testname, double runtime);
+/* Text output format */
+static void header_text(const char *line);
+static void footer_text(const char *difffilename, const char *logfilename);
+static void comment_text(const char *comment);
+static void test_status_preamble_text(const char *testname);
+static void test_status_ok_text(const char *testname);
+static void test_status_failed_text(const char *testname);
+static void test_runtime_text(const char *testname, double runtime);
+
+struct output_func output_func_text =
+{
+ header_text,
+ footer_text,
+ comment_text,
+ test_status_preamble_text,
+ test_status_ok_text,
+ test_status_failed_text,
+ NULL,
+ test_runtime_text
+};
+
+/* TAP output format */
+static void header_tap(const char *line);
+static void footer_tap(const char *difffilename, const char *logfilename);
+static void comment_tap(const char *comment);
+static void test_status_ok_tap(const char *testname);
+static void test_status_failed_tap(const char *testname);
+static void test_status_ignored_tap(const char *testname);
+
+struct output_func output_func_tap =
+{
+ header_tap,
+ footer_tap,
+ comment_tap,
+ NULL,
+ test_status_ok_tap,
+ test_status_failed_tap,
+ test_status_ignored_tap,
+ NULL
+};
+
+struct output_func *output = &output_func_text;
+
+static void test_status_ok(const char *testname);
+
static void status(const char *fmt,...) pg_attribute_printf(1, 2);
static void psql_command(const char *database, const char *query,...) pg_attribute_printf(2, 3);
+static void status_end(void);
/*
* allow core files if possible.
@@ -206,18 +269,227 @@ split_to_stringlist(const char *s, const char *delim, _stringlist **listhead)
/*
* Print a progress banner on stdout.
*/
+static void
+header_text(const char *line)
+{
+ fprintf(stdout, "============== %-38s ==============\n", line);
+ fflush(stdout);
+}
+
+static void
+header_tap(const char *line)
+{
+ fprintf(stdout, "# %s\n", line);
+ fflush(stdout);
+}
+
static void
header(const char *fmt,...)
{
char tmp[64];
va_list ap;
+ if (!output->header)
+ return;
+
va_start(ap, fmt);
vsnprintf(tmp, sizeof(tmp), fmt, ap);
va_end(ap);
- fprintf(stdout, "============== %-38s ==============\n", tmp);
- fflush(stdout);
+ output->header(tmp);
+}
+
+static void
+footer_tap(const char *difffilename, const char *logfilename)
+{
+ status("1..%i\n", (fail_count + fail_ignore_count + success_count));
+ status_end();
+}
+
+static void
+footer(const char *difffilename, const char *logfilename)
+{
+ if (output->footer)
+ output->footer(difffilename, logfilename);
+}
+
+static void
+comment_text(const char *comment)
+{
+ status("%s", comment);
+}
+
+static void
+comment_tap(const char *comment)
+{
+ status("# %s", comment);
+}
+
+static void
+comment(const char *fmt,...)
+{
+ char tmp[256];
+ va_list ap;
+
+ if (!output->comment)
+ return;
+
+ va_start(ap, fmt);
+ vsnprintf(tmp, sizeof(tmp), fmt, ap);
+ va_end(ap);
+
+ output->comment(tmp);
+}
+
+static void
+test_status_preamble_text(const char *testname)
+{
+ status(_("test %-28s ... "), testname);
+}
+
+static void
+test_status_preamble(const char *testname)
+{
+ if (output->test_status_preamble)
+ output->test_status_preamble(testname);
+}
+
+static void
+test_status_ok_tap(const char *testname)
+{
+ /* There is no NLS translation here as "ok" is a protocol message */
+ status("ok %i - %s",
+ (fail_count + fail_ignore_count + success_count),
+ testname);
+}
+
+static void
+test_status_ok_text(const char *testname)
+{
+ (void) testname; /* unused */
+ status(_("ok ")); /* align with FAILED */
+}
+
+static void
+test_status_ok(const char *testname)
+{
+ success_count++;
+ if (output->test_status_ok)
+ output->test_status_ok(testname);
+}
+
+static void
+test_status_failed_tap(const char *testname)
+{
+ status("not ok %i - %s",
+ (fail_count + fail_ignore_count + success_count),
+ testname);
+}
+
+static void
+test_status_failed_text(const char *testname)
+{
+ status(_("FAILED"));
+}
+
+static void
+test_status_failed(const char *testname)
+{
+ fail_count++;
+ if (output->test_status_failed)
+ output->test_status_failed(testname);
+}
+
+static void
+test_status_ignored(const char *testname)
+{
+ fail_ignore_count++;
+ if (output->test_status_ignored)
+ output->test_status_ignored(testname);
+}
+
+static void
+test_status_ignored_tap(const char *testname)
+{
+ status("ok %i - %s # SKIP (ignored)",
+ (fail_count + fail_ignore_count + success_count),
+ testname);
+}
+
+static void
+test_runtime_text(const char *testname, double runtime)
+{
+ (void)testname;
+ status(_(" %8.0f ms"), runtime);
+}
+
+static void
+runtime(const char *testname, double runtime)
+{
+ if (output->test_runtime)
+ output->test_runtime(testname, runtime);
+}
+
+static void
+footer_text(const char *difffilename, const char *logfilename)
+{
+ char buf[256];
+
+ /*
+ * Emit nice-looking summary message
+ */
+ if (fail_count == 0 && fail_ignore_count == 0)
+ snprintf(buf, sizeof(buf),
+ _(" All %d tests passed. "),
+ success_count);
+ else if (fail_count == 0) /* fail_count=0, fail_ignore_count>0 */
+ snprintf(buf, sizeof(buf),
+ _(" %d of %d tests passed, %d failed test(s) ignored. "),
+ success_count,
+ success_count + fail_ignore_count,
+ fail_ignore_count);
+ else if (fail_ignore_count == 0) /* fail_count>0 && fail_ignore_count=0 */
+ snprintf(buf, sizeof(buf),
+ _(" %d of %d tests failed. "),
+ fail_count,
+ success_count + fail_count);
+ else
+ /* fail_count>0 && fail_ignore_count>0 */
+ snprintf(buf, sizeof(buf),
+ _(" %d of %d tests failed, %d of these failures ignored. "),
+ fail_count + fail_ignore_count,
+ success_count + fail_count + fail_ignore_count,
+ fail_ignore_count);
+
+ putchar('\n');
+ for (int i = strlen(buf); i > 0; i--)
+ putchar('=');
+ printf("\n%s\n", buf);
+ for (int i = strlen(buf); i > 0; i--)
+ putchar('=');
+ putchar('\n');
+ putchar('\n');
+
+ if (difffilename && logfilename)
+ {
+ printf(_("The differences that caused some tests to fail can be viewed in the\n"
+ "file \"%s\". A copy of the test summary that you see\n"
+ "above is saved in the file \"%s\".\n\n"),
+ difffilename, logfilename);
+ }
+}
+
+static void
+status_start(bool single, const char *testname)
+{
+ /* TAP only outputs after the test has finished */
+ if (tap)
+ return;
+
+ if (single)
+ status(_("test %-24s ... "), testname);
+ else
+ status(_(" %-24s ... "), testname);
}
/*
@@ -917,13 +1189,13 @@ initialize_environment(void)
#endif
if (pghost && pgport)
- printf(_("(using postmaster on %s, port %s)\n"), pghost, pgport);
+ comment(_("(using postmaster on %s, port %s)\n"), pghost, pgport);
if (pghost && !pgport)
- printf(_("(using postmaster on %s, default port)\n"), pghost);
+ comment(_("(using postmaster on %s, default port)\n"), pghost);
if (!pghost && pgport)
- printf(_("(using postmaster on Unix socket, port %s)\n"), pgport);
+ comment(_("(using postmaster on Unix socket, port %s)\n"), pgport);
if (!pghost && !pgport)
- printf(_("(using postmaster on Unix socket, default port)\n"));
+ comment(_("(using postmaster on Unix socket, default port)\n"));
}
convert_sourcefiles();
@@ -1167,9 +1439,10 @@ psql_command(const char *database, const char *query,...)
/* And now we can build and execute the shell command */
snprintf(psql_cmd, sizeof(psql_cmd),
- "\"%s%spsql\" -X -c \"%s\" \"%s\"",
+ "\"%s%spsql\" %s -X -c \"%s\" \"%s\"",
bindir ? bindir : "",
bindir ? "/" : "",
+ tap ? "-q" : "",
query_escaped,
database);
@@ -1704,6 +1977,9 @@ run_schedule(const char *schedule, test_start_function startfunc,
c++;
add_stringlist_item(&ignorelist, c);
+ test_status_ignored(c);
+ status_end();
+
/*
* Note: ignore: lines do not run the test, they just say that
* failure of this test when run later on is to be ignored. A bit
@@ -1762,7 +2038,7 @@ run_schedule(const char *schedule, test_start_function startfunc,
if (num_tests == 1)
{
- status(_("test %-28s ... "), tests[0]);
+ test_status_preamble(tests[0]);
pids[0] = (startfunc) (tests[0], &resultfiles[0], &expectfiles[0], &tags[0]);
INSTR_TIME_SET_CURRENT(starttimes[0]);
wait_for_tests(pids, statuses, stoptimes, NULL, 1);
@@ -1778,8 +2054,8 @@ run_schedule(const char *schedule, test_start_function startfunc,
{
int oldest = 0;
- status(_("parallel group (%d tests, in groups of %d): "),
- num_tests, max_connections);
+ comment(_("parallel group (%d tests, in groups of %d): "),
+ num_tests, max_connections);
for (i = 0; i < num_tests; i++)
{
if (i - oldest >= max_connections)
@@ -1799,7 +2075,7 @@ run_schedule(const char *schedule, test_start_function startfunc,
}
else
{
- status(_("parallel group (%d tests): "), num_tests);
+ comment(_("parallel group (%d tests): "), num_tests);
for (i = 0; i < num_tests; i++)
{
pids[i] = (startfunc) (tests[i], &resultfiles[i], &expectfiles[i], &tags[i]);
@@ -1818,7 +2094,7 @@ run_schedule(const char *schedule, test_start_function startfunc,
bool differ = false;
if (num_tests > 1)
- status(_(" %-28s ... "), tests[i]);
+ test_status_preamble(tests[i]);
/*
* Advance over all three lists simultaneously.
@@ -1858,27 +2134,18 @@ run_schedule(const char *schedule, test_start_function startfunc,
}
}
if (ignore)
- {
- status(_("failed (ignored)"));
- fail_ignore_count++;
- }
+ test_status_ignored(tests[i]);
else
- {
- status(_("FAILED"));
- fail_count++;
- }
+ test_status_failed(tests[i]);
}
else
- {
- status(_("ok ")); /* align with FAILED */
- success_count++;
- }
+ test_status_ok(tests[i]);
if (statuses[i] != 0)
log_child_failure(statuses[i]);
INSTR_TIME_SUBTRACT(stoptimes[i], starttimes[i]);
- status(_(" %8.0f ms"), INSTR_TIME_GET_MILLISEC(stoptimes[i]));
+ runtime(tests[i], INSTR_TIME_GET_MILLISEC(stoptimes[i]));
status_end();
}
@@ -1917,7 +2184,7 @@ run_single_test(const char *test, test_start_function startfunc,
*tl;
bool differ = false;
- status(_("test %-28s ... "), test);
+ test_status_preamble(test);
pid = (startfunc) (test, &resultfiles, &expectfiles, &tags);
INSTR_TIME_SET_CURRENT(starttime);
wait_for_tests(&pid, &exit_status, &stoptime, NULL, 1);
@@ -1947,15 +2214,9 @@ run_single_test(const char *test, test_start_function startfunc,
}
if (differ)
- {
- status(_("FAILED"));
- fail_count++;
- }
+ test_status_failed(test);
else
- {
- status(_("ok ")); /* align with FAILED */
- success_count++;
- }
+ test_status_ok(test);
if (exit_status != 0)
log_child_failure(exit_status);
@@ -2152,6 +2413,7 @@ regression_main(int argc, char *argv[],
{"config-auth", required_argument, NULL, 24},
{"max-concurrent-tests", required_argument, NULL, 25},
{"make-testtablespace-dir", no_argument, NULL, 26},
+ {"tap", no_argument, NULL, 27},
{NULL, 0, NULL, 0}
};
@@ -2285,6 +2547,9 @@ regression_main(int argc, char *argv[],
case 26:
make_testtablespace_dir = true;
break;
+ case 27:
+ tap = true;
+ break;
default:
/* getopt_long already emitted a complaint */
fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
@@ -2311,6 +2576,9 @@ regression_main(int argc, char *argv[],
exit(0);
}
+ if (tap)
+ output = &output_func_tap;
+
if (temp_instance && !port_specified_by_user)
/*
@@ -2636,54 +2904,20 @@ regression_main(int argc, char *argv[],
fclose(logfile);
- /*
- * Emit nice-looking summary message
- */
- if (fail_count == 0 && fail_ignore_count == 0)
- snprintf(buf, sizeof(buf),
- _(" All %d tests passed. "),
- success_count);
- else if (fail_count == 0) /* fail_count=0, fail_ignore_count>0 */
- snprintf(buf, sizeof(buf),
- _(" %d of %d tests passed, %d failed test(s) ignored. "),
- success_count,
- success_count + fail_ignore_count,
- fail_ignore_count);
- else if (fail_ignore_count == 0) /* fail_count>0 && fail_ignore_count=0 */
- snprintf(buf, sizeof(buf),
- _(" %d of %d tests failed. "),
- fail_count,
- success_count + fail_count);
- else
- /* fail_count>0 && fail_ignore_count>0 */
- snprintf(buf, sizeof(buf),
- _(" %d of %d tests failed, %d of these failures ignored. "),
- fail_count + fail_ignore_count,
- success_count + fail_count + fail_ignore_count,
- fail_ignore_count);
-
- putchar('\n');
- for (i = strlen(buf); i > 0; i--)
- putchar('=');
- printf("\n%s\n", buf);
- for (i = strlen(buf); i > 0; i--)
- putchar('=');
- putchar('\n');
- putchar('\n');
-
- if (file_size(difffilename) > 0)
- {
- printf(_("The differences that caused some tests to fail can be viewed in the\n"
- "file \"%s\". A copy of the test summary that you see\n"
- "above is saved in the file \"%s\".\n\n"),
- difffilename, logfilename);
- }
- else
+ if (file_size(difffilename) <= 0)
{
unlink(difffilename);
unlink(logfilename);
+
+ free(difffilename);
+ difffilename = NULL;
+ free(logfilename);
+ logfilename = NULL;
}
+ footer(difffilename, logfilename);
+ status_end();
+
if (fail_count != 0)
exit(1);
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 16:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:01 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 11:54 ` Re: [RFC] building postgres with meson Daniel Gustafsson <daniel@yesql.se>
@ 2022-02-21 16:52 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-02-21 16:52 UTC (permalink / raw)
To: Daniel Gustafsson <daniel@yesql.se>; +Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-13 13:54:10 +0200, Daniel Gustafsson wrote:
> I added a --tap option for TAP output to pg_regress together with Jinbao Chen
> for giggles and killing some time a while back.
Sorry for not replying to this earlier. I somehow thought I had, but the
archives disagree.
I think this would be great.
> If it's helpful and there's any interest for this I'm happy to finish it up now.
Yes! Probably worth starting a new thread for...
> One thing that came out of this, is that we don't really handle the ignored
> tests in the way the code thinks it does for normal output, the attached treats
> ignored tests as SKIP tests.
I can't really parse the first sentence...
> if (exit_status != 0)
> log_child_failure(exit_status);
> @@ -2152,6 +2413,7 @@ regression_main(int argc, char *argv[],
> {"config-auth", required_argument, NULL, 24},
> {"max-concurrent-tests", required_argument, NULL, 25},
> {"make-testtablespace-dir", no_argument, NULL, 26},
> + {"tap", no_argument, NULL, 27},
> {NULL, 0, NULL, 0}
> };
I'd make it a --format=(regress|tap) or such.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 15:08 ` Andrew Dunstan <andrew@dunslane.net>
11 siblings, 0 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 15:08 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; pgsql-hackers
On 10/12/21 4:37 AM, Andres Freund wrote:
> git remote add andres git@github.com:anarazel/postgres.git
ITYM:
git remote add andres git://github.com/anarazel/postgres.git
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 15:21 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
11 siblings, 1 reply; 143+ messages in thread
From: Josef Šimánek @ 2021-10-12 15:21 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
.
út 12. 10. 2021 v 10:37 odesílatel Andres Freund <andres@anarazel.de> napsal:
>
> Hi,
>
> For the last year or so I've on and off tinkered with $subject. I think
> it's in a state worth sharing now. First, let's look at a little
> comparison.
>
> My workstation:
>
> non-cached configure:
> current: 11.80s
> meson: 6.67s
>
> non-cached build (world-bin):
> current: 40.46s
> ninja: 7.31s
>
> no-change build:
> current: 1.17s
> ninja: 0.06s
>
> test world:
> current: 105s
> meson: 63s
>
>
> What actually started to motivate me however were the long times windows
> builds took to come back with testsresults. On CI, with the same machine
> config:
>
> build:
> current: 202s (doesn't include genbki etc)
> meson+ninja: 140s
> meson+msbuild: 206s
>
>
> test:
> current: 1323s (many commands)
> meson: 903s (single command)
>
> (note that the test comparison isn't quite fair - there's a few tests
> missing, but it's just small contrib ones afaik)
>
>
> The biggest difference to me however is not the speed, but how readable
> the output is.
>
> Running the tests with meson in a terminal, shows the number of tests
> that completed out of how many total, how much time has passed, how long
> the currently running tests already have been running.
>
> At the end of a testrun a count of tests is shown:
>
> 188/189 postgresql:tap+pg_basebackup / pg_basebackup/t/010_pg_basebackup.pl OK 39.51s 110 subtests passed
> 189/189 postgresql:isolation+snapshot_too_old / snapshot_too_old/isolation OK 62.93s
>
>
> Ok: 188
> Expected Fail: 0
> Fail: 1
> Unexpected Pass: 0
> Skipped: 0
> Timeout: 0
>
> Full log written to /tmp/meson/meson-logs/testlog.txt
>
>
> The log has the output of the tests and ends with:
>
> Summary of Failures:
> 120/189 postgresql:tap+recovery / recovery/t/007_sync_rep.pl ERROR 7.16s (exit status 255 or signal 127 SIGinvalid)
>
>
> Quite the difference to make check-world -jnn output.
>
>
> So, now that the teasing is done, let me explain a bit what lead me down
> this path:
>
> Autoconf + make is not being actively developed. Especially autoconf is
> *barely* in maintenance mode - despite many shortcomings and bugs. It's
> also technology that very few want to use - autoconf m4 is scary, and
> it's scarier for people that started more recently than a lot of us
> committers for example.
>
> Recursive make as we use it is hard to get right. One reason the clean
> make build is so slow compared to meson is that we had to resort to
> .NOTPARALLEL to handle dependencies in a bunch of places. And despite
> that, I quite regularly see incremental build failures that can be
> resolved by retrying the build.
>
> While we have incremental build via --enable-depend, they don't work
> that reliable (i.e. misses necessary rebuilds) and yet is often too
> aggressive. More modern build system can keep track of the precise
> command used to build a target and rebuild it when that command changes.
>
>
> We also don't just have the autoconf / make buildsystem, there's also
> the msvc project generator - something most of us unix-y folks do not
> like to touch. I think that, combined with there being no easy way to
> run all tests, and it being just different, really hurt our windows
> developer appeal (and subsequently the quality of postgres on
> windows). I'm not saying this to ding the project generator - that was
> well before there were decent "meta" buildsystems out there (and in some
> ways it is a small one itself).
>
>
> The last big issue I have with the current situation is that there's no
> good test integration. make check-world output is essentially unreadable
> / not automatically parseable. Which led to the buildfarm having a
> separate list of things it needs to test, so that failures can be
> pinpointed and paired with appropriate logs. That approach unfortunately
> doesn't scale well to multi-core CPUs, slowing down the buildfarm by a
> fair bit.
>
>
> This all led to me to experiment with improvements. I tried a few
> somewhat crazy but incremental things like converting our buildsystem to
> non-recursive make (I got it to build the backend, but it's too hard to
> do manually I think), or to not run tests during the recursive make
> check-world, but to append commands to a list of tests, that then is run
> by a helper (can kinda be made to work). In the end I concluded that
> the amount of time we'd need to invest to maintain our more-and-more
> custom buildsystem going forward doesn't make sense.
>
>
> Which lead me to look around and analyze which other buildsystems there
> are that could make some sense for us. The halfway decent list includes,
> I think:
> 1) cmake
> 2) bazel
> 3) meson
>
>
> cmake would be a decent choice, I think. However, I just can't fully
> warm up to it. Something about it just doesn't quite sit right with
> me. That's not a good enough reason to prevent others from suggesting to
> use it, but it's good enough to justify not investing a lot of time in
> it myself.
>
> Bazel has some nice architectural properties. But it requires a JVM to
> run - I think that basically makes it insuitable for us. And the build
> information seems quite arduous to maintain too.
>
> Which left me with meson. It is a meta-buildsystem that can do the
> actual work of building via ninja (the most common one, also targeted by
> cmake), msbuild (visual studio project files, important for GUI work)
> and xcode projects (I assume that's for a macos IDE, but I haven't tried
> to use it). Meson roughly does what autoconf+automake did, in a
> python-esque DSL, and outputs build-instructions for ninja / msbuild /
> xcode. One interesting bit is that meson itself is written in python (
> and fairly easy to contribute too - I got a few changes in now).
>
>
> I don't think meson is perfect architecturally - e.g. its insistence on
> not having functions ends up making it a bit harder to not end up
> duplicating code. There's some user-interface oddities that are now hard
> to fix fully, due to the faily wide usage. But all-in-all it's pretty
> nice to use.
>
>
> Its worth calling out that a lot of large open source projects have been
> / are migrating to meson. qemu/kvm, mesa (core part of graphics stack on
> linux and also widely used in other platforms), a good chunk of GNOME,
> and quite a few more. Due to that it seems unlikely to be abandoned
> soon.
>
>
> As far as I can tell the only OS that postgres currently supports that
> meson doesn't support is HPUX. It'd likely be fairly easy to add
> gcc-on-hpux support, a chunk more to add support for the proprietary
> ones.
>
>
> The attached patch (meson support is 0016, the rest is prerequisites
> that aren't that interesting at this stage) converts most of postgres to
> meson. There's a few missing contrib modules, only about half the
> optional library dependencies are implemented, and I've only built on
> x64. It builds on freebsd, linux, macos and windows (both ninja and
> msbuild) and cross builds from linux to windows. Thomas helped make the
> freebsd / macos pieces a reality, thanks!
>
> I took a number of shortcuts (although there used to be a *lot*
> more). So this shouldn't be reviewed to the normal standard of the
> community - it's a prototype. But I think it's in a complete enough
> shape that it allows to do a well-informed evaluation.
>
> What doesn't yet work/ build:
>
> - plenty optional libraries, contrib, NLS, docs build
>
> - PGXS - and I don't yet know what to best do about it. One
> backward-compatible way would be to continue use makefiles for pgxs,
> but do the necessary replacement of Makefile.global.in via meson (and
> not use that for postgres' own build). But that doesn't really
> provide a nicer path for building postgres extensions on windows, so
> it'd definitely not be a long-term path.
>
> - JIT bitcode generation for anything but src/backend.
>
> - anything but modern-ish x86. That's proably a small amount of work,
> but something that needs to be done.
>
> - exporting all symbols for extension modules on windows (the stuff for
> postgres is implemented). Instead I marked the relevant symbols als
> declspec(dllexport). I think we should do that regardless of the
> buildsystem change. Restricting symbol visibility via gcc's
> -fvisibility=hidden for extensions results in a substantially reduced
> number of exported symbols, and even reduces object size (and I think
> improves the code too). I'll send an email about that separately.
>
>
>
>
> There's a lot more stuff to talk about, but I'll stop with a small bit
> of instructions below:
>
>
> Demo / instructions:
> # Get code
> git remote add andres git@github.com:anarazel/postgres.git
> git fetch andres
> git checkout --track andres/meson
>
> # setup build directory
> meson setup build --buildtype debug
> cd build
>
> # build (uses automatically as many cores as available)
> ninja
I'm getting errors at this step. You can find my output at
https://pastebin.com/Ar5VqfFG. Setup went well without errors. Is that
expected for now?
> # change configuration, build again
> meson configure -Dssl=openssl
> ninja
>
> # run all tests
> meson test
>
> # run just recovery tests
> meson test --suite setup --suite recovery
>
> # list tests
> meson test --list
>
>
> Greetings,
>
> Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-12 17:17 ` Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 17:17 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 17:21:50 +0200, Josef Šimánek wrote:
> > # build (uses automatically as many cores as available)
> > ninja
>
> I'm getting errors at this step. You can find my output at
> https://pastebin.com/Ar5VqfFG. Setup went well without errors. Is that
> expected for now?
Thanks, that's helpful. And no, that's not expected (*), it should be fixed.
What OS / distribution / version is this?
Can you build postgres "normally" with --with-gss? Seems like we're ending up
with a version of gssapi that we're not compatible with.
You should be able to get past this by disabling gss using meson configure
-Dgssapi=disabled.
Greetings,
Andres Freund
* except kinda, in the sense that I'd expect it to be buggy, given that I've
run it only on a few machines and it's very, uh, bleeding edge
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 23:19 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Josef Šimánek @ 2021-10-12 23:19 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
út 12. 10. 2021 v 19:17 odesílatel Andres Freund <andres@anarazel.de> napsal:
>
> Hi,
>
> On 2021-10-12 17:21:50 +0200, Josef Šimánek wrote:
> > > # build (uses automatically as many cores as available)
> > > ninja
> >
> > I'm getting errors at this step. You can find my output at
> > https://pastebin.com/Ar5VqfFG. Setup went well without errors. Is that
> > expected for now?
>
> Thanks, that's helpful. And no, that's not expected (*), it should be fixed.
>
> What OS / distribution / version is this?
Fedora 34 (64 bit)
> Can you build postgres "normally" with --with-gss? Seems like we're ending up
> with a version of gssapi that we're not compatible with.
Yes, I can.
> You should be able to get past this by disabling gss using meson configure
> -Dgssapi=disabled.
I tried to clean and start from scratch, but I'm getting different
error probably related to wrongly configured JIT (LLVM wasn't found
during meson setup). I'll debug on my side to provide more info.
Whole build error could be found at https://pastebin.com/hCFqcPvZ.
Setup log could be found at https://pastebin.com/wjbE1w56.
> Greetings,
>
> Andres Freund
>
> * except kinda, in the sense that I'd expect it to be buggy, given that I've
> run it only on a few machines and it's very, uh, bleeding edge
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-12 23:54 ` Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 23:54 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 01:19:27 +0200, Josef Šimánek wrote:
> I tried to clean and start from scratch, but I'm getting different
> error probably related to wrongly configured JIT (LLVM wasn't found
> during meson setup). I'll debug on my side to provide more info.
../src/backend/jit/jit.c:91:73: error: ‘DLSUFFIX’ undeclared (first use in this function)
91 | snprintf(path, MAXPGPATH, "%s/%s%s", pkglib_path, jit_provider, DLSUFFIX);
| ^~~~~~~~
This *very* likely is related to building in a source tree that also contains
a "non-meson" build "in place". The problem is that the meson build picks up
the pg_config.h generated by ./configure in the "normal" build, rather than
the one meson generated itself.
You'd need to execute make distclean or such, or use a separate git checkout.
I forgot about this issue because I only ever build postgres from outside the
source-tree (by invoking configure from a separate directory), so there's
never build products in it. I think at least I need to make the build emit a
warning / error if there's a pg_config.h in the source tree...
This is the part of the jit code that's built regardless of llvm availability
- you'd get the same error in a few other places unrelated to jit.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 21:58 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Josef Šimánek @ 2021-10-13 21:58 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
st 13. 10. 2021 v 1:54 odesílatel Andres Freund <andres@anarazel.de> napsal:
>
> Hi,
>
> On 2021-10-13 01:19:27 +0200, Josef Šimánek wrote:
> > I tried to clean and start from scratch, but I'm getting different
> > error probably related to wrongly configured JIT (LLVM wasn't found
> > during meson setup). I'll debug on my side to provide more info.
>
> ../src/backend/jit/jit.c:91:73: error: ‘DLSUFFIX’ undeclared (first use in this function)
> 91 | snprintf(path, MAXPGPATH, "%s/%s%s", pkglib_path, jit_provider, DLSUFFIX);
> | ^~~~~~~~
>
> This *very* likely is related to building in a source tree that also contains
> a "non-meson" build "in place". The problem is that the meson build picks up
> the pg_config.h generated by ./configure in the "normal" build, rather than
> the one meson generated itself.
>
> You'd need to execute make distclean or such, or use a separate git checkout.
>
> I forgot about this issue because I only ever build postgres from outside the
> source-tree (by invoking configure from a separate directory), so there's
> never build products in it. I think at least I need to make the build emit a
> warning / error if there's a pg_config.h in the source tree...
Hello, thanks for the hint. I can finally build using meson and run
regress tests.
The only problem I do have currently is auto-detection of perl. I'm
getting error related to missing "Opcode.pm". PERL is autodetected and
enabled (https://pastebin.com/xfRRrDcU).
I do get the same error when I enforce perl for current master build
(./configure --with-perl). Using ./configure with perl autodetection
skips plperl extension on my system.
Disabling perl manually for meson build (meson setup build
--reconfigure --buildtype debug -Dperl=disabled) works for me.
>
> This is the part of the jit code that's built regardless of llvm availability
> - you'd get the same error in a few other places unrelated to jit.
>
> Greetings,
>
> Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-14 13:14 ` Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
1 sibling, 1 reply; 143+ messages in thread
From: Dagfinn Ilmari Mannsåker @ 2021-10-14 13:14 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
Josef Šimánek <josef.simanek@gmail.com> writes:
> The only problem I do have currently is auto-detection of perl. I'm
> getting error related to missing "Opcode.pm". PERL is autodetected and
> enabled (https://pastebin.com/xfRRrDcU).
Your Perl (not PERL) installation seems to be incomplete. Opcode.pm is a
core module, and should be in /usr/lib64/perl5, judging by the paths in
the error message.
Which OS is this? Some Linux distributions have separate packages for
the interpreter itself and the included modules, and the packages can be
named confusingly. E.g. on older Redhat/Fedora versions you have to
install the 'perl-core' package to get all the modules, 'perl' is just
the interpreter and the bare minimum set of strictily necessary modules.
They've fixed this in recent versions (Fedora 34 and Redhat 8, IIRC), so
that 'perl' gives you the hole bundle, and 'perl-interpeter' is the
minimal one.
- ilmari
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@ 2021-10-14 13:19 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 13:32 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
0 siblings, 2 replies; 143+ messages in thread
From: Josef Šimánek @ 2021-10-14 13:19 UTC (permalink / raw)
To: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
čt 14. 10. 2021 v 15:14 odesílatel Dagfinn Ilmari Mannsåker
<ilmari@ilmari.org> napsal:
>
> Josef Šimánek <josef.simanek@gmail.com> writes:
>
> > The only problem I do have currently is auto-detection of perl. I'm
> > getting error related to missing "Opcode.pm". PERL is autodetected and
> > enabled (https://pastebin.com/xfRRrDcU).
>
> Your Perl (not PERL) installation seems to be incomplete. Opcode.pm is a
> core module, and should be in /usr/lib64/perl5, judging by the paths in
> the error message.
>
> Which OS is this? Some Linux distributions have separate packages for
> the interpreter itself and the included modules, and the packages can be
> named confusingly. E.g. on older Redhat/Fedora versions you have to
> install the 'perl-core' package to get all the modules, 'perl' is just
> the interpreter and the bare minimum set of strictily necessary modules.
>
> They've fixed this in recent versions (Fedora 34 and Redhat 8, IIRC), so
> that 'perl' gives you the hole bundle, and 'perl-interpeter' is the
> minimal one.
I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
package. Anyway it behaves differently with autoconf tools and the
meson build system. Is perl disabled by default in the current build
system?
>
> - ilmari
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-14 13:29 ` Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Alvaro Herrera @ 2021-10-14 13:29 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; Andres Freund <andres@anarazel.de>; pgsql-hackers
On 2021-Oct-14, Josef Šimánek wrote:
> I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
> package. Anyway it behaves differently with autoconf tools and the
> meson build system. Is perl disabled by default in the current build
> system?
Yes, you have to use --with-perl in order to get it.
--
Álvaro Herrera Valdivia, Chile — https://www.EnterpriseDB.com/
"Puedes vivir sólo una vez, pero si lo haces bien, una vez es suficiente"
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
@ 2021-10-14 17:24 ` Andres Freund <andres@anarazel.de>
2021-10-14 19:36 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 22:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-14 17:24 UTC (permalink / raw)
To: Alvaro Herrera <alvherre@alvh.no-ip.org>; +Cc: Josef Šimánek <josef.simanek@gmail.com>; Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; pgsql-hackers
Hi,
On 2021-10-14 10:29:42 -0300, Alvaro Herrera wrote:
> On 2021-Oct-14, Josef Šimánek wrote:
>
> > I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
> > package. Anyway it behaves differently with autoconf tools and the
> > meson build system. Is perl disabled by default in the current build
> > system?
Hm, so it seems we should make the test separately verify that perl -M{Opcode,
ExtUtils::Embed, ExtUtils::ParseXS} doesn't fail, so that we can fail perl
detection with a useful message?
> Yes, you have to use --with-perl in order to get it.
With the meson prototype I set most optional features to "auto", except for
LLVM, as that increases compile times noticeably.
For configure we didn't/don't want to do much auto-detection, because that
makes life harder for distributors. But meson has one switch controlling all
features set to 'auto' and not explicitly enabled/disabled:
--auto-features {enabled,disabled,auto} Override value of all 'auto' features (default: auto).
so the argument doesn't apply to the same degree there. We could default
auto-features to something else too.
There were two other reasons:
1) I got tired of needing to disable zlib, readline to be able to build on
windows.
2) Exercising all the dependency detection / checking seems important at this
stage
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 19:36 ` Josef Šimánek <josef.simanek@gmail.com>
1 sibling, 0 replies; 143+ messages in thread
From: Josef Šimánek @ 2021-10-14 19:36 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Alvaro Herrera <alvherre@alvh.no-ip.org>; Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; pgsql-hackers
čt 14. 10. 2021 v 19:24 odesílatel Andres Freund <andres@anarazel.de> napsal:
>
> Hi,
>
> On 2021-10-14 10:29:42 -0300, Alvaro Herrera wrote:
> > On 2021-Oct-14, Josef Šimánek wrote:
> >
> > > I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
> > > package. Anyway it behaves differently with autoconf tools and the
> > > meson build system. Is perl disabled by default in the current build
> > > system?
>
> Hm, so it seems we should make the test separately verify that perl -M{Opcode,
> ExtUtils::Embed, ExtUtils::ParseXS} doesn't fail, so that we can fail perl
> detection with a useful message?
I can confirm "perl -MOpcode" fails. ExtUtils::Embed and
ExtUtils::ParseXS are present. Looking at the local system history of
perl-interpreter package, it seems to be installed by default on
Fedora 34. Friendly error message would be welcomed.
>
> > Yes, you have to use --with-perl in order to get it.
>
> With the meson prototype I set most optional features to "auto", except for
> LLVM, as that increases compile times noticeably.
>
> For configure we didn't/don't want to do much auto-detection, because that
> makes life harder for distributors. But meson has one switch controlling all
> features set to 'auto' and not explicitly enabled/disabled:
> --auto-features {enabled,disabled,auto} Override value of all 'auto' features (default: auto).
> so the argument doesn't apply to the same degree there. We could default
> auto-features to something else too.
>
> There were two other reasons:
>
> 1) I got tired of needing to disable zlib, readline to be able to build on
> windows.
> 2) Exercising all the dependency detection / checking seems important at this
> stage
Clear, thanks for the info.
> Greetings,
>
> Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 22:08 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:38 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-14 22:08 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Alvaro Herrera <alvherre@alvh.no-ip.org>; Josef Šimánek <josef.simanek@gmail.com>; Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> Hm, so it seems we should make the test separately verify that perl -M{Opcode,
> ExtUtils::Embed, ExtUtils::ParseXS} doesn't fail, so that we can fail perl
> detection with a useful message?
Our existing policy is that we should check this at configure time,
not later. Since plperl won't work at all without Opcode, it seems
appropriate to add a check there if you say --with-perl. I wasn't
aware that Red Hat had unbundled that from the minimal perl
installation :-(.
OTOH, if they've not unbundled ExtUtils::Embed or ExtUtils::ParseXS,
I doubt it's worth the configure cycles to check for those separately.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-14 23:38 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:51 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-14 23:38 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Alvaro Herrera <alvherre@alvh.no-ip.org>; Josef Šimánek <josef.simanek@gmail.com>; Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; pgsql-hackers
Hi,
On 2021-10-14 18:08:58 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > Hm, so it seems we should make the test separately verify that perl -M{Opcode,
> > ExtUtils::Embed, ExtUtils::ParseXS} doesn't fail, so that we can fail perl
> > detection with a useful message?
>
> Our existing policy is that we should check this at configure time,
> not later.
Yea, I was thinking of configure (and meson's equivalent) as well.
> Since plperl won't work at all without Opcode, it seems
> appropriate to add a check there if you say --with-perl. I wasn't
> aware that Red Hat had unbundled that from the minimal perl
> installation :-(.
>
> OTOH, if they've not unbundled ExtUtils::Embed or ExtUtils::ParseXS,
> I doubt it's worth the configure cycles to check for those separately.
On debian the perl binary, with a sparse set of modules is in
perl-base. ExtUtils::Embed and ExtUtils::ParseXS are in
perl-modules-x.yy. Whereas Opcode is in libperlx.yy. But libperlx.yy depends
on perl-modules-x.yy so I guess an Opcode.pm check would suffice.
Seems we can just check all of them at once with with something like
perl -MOpcode -MExtUtils::Embed -MExtUtils::ParseXSNotAvailable -e ''
Can't locate ExtUtils/ParseXSNotAvailable.pm in @INC (you may need to install the ExtUtils::ParseXS3 module) (@INC contains: /home/andres/bin/perl5/lib/perl5/x86_64-linux-gnu-thread-multi /home/andres/bin/perl5/lib/perl5 /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.32.1 /usr/local/share/perl/5.32.1 /usr/lib/x86_64-linux-gnu/perl5/5.32 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl-base /usr/lib/x86_64-linux-gnu/perl/5.32 /usr/share/perl/5.32 /usr/local/lib/site_perl).
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Re: [RFC] building postgres with meson Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:38 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 23:51 ` Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 0 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-14 23:51 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Alvaro Herrera <alvherre@alvh.no-ip.org>; Josef Šimánek <josef.simanek@gmail.com>; Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2021-10-14 18:08:58 -0400, Tom Lane wrote:
>> Andres Freund <andres@anarazel.de> writes:
>>> Hm, so it seems we should make the test separately verify that perl -M{Opcode,
>>> ExtUtils::Embed, ExtUtils::ParseXS} doesn't fail, so that we can fail perl
>>> detection with a useful message?
>> Our existing policy is that we should check this at configure time,
>> not later.
> Yea, I was thinking of configure (and meson's equivalent) as well.
Ah, sorry, I misunderstood what you meant by "test".
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-14 13:32 ` Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 19:29 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
1 sibling, 1 reply; 143+ messages in thread
From: Dagfinn Ilmari Mannsåker @ 2021-10-14 13:32 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
Josef Šimánek <josef.simanek@gmail.com> writes:
> čt 14. 10. 2021 v 15:14 odesílatel Dagfinn Ilmari Mannsåker
> <ilmari@ilmari.org> napsal:
>>
>> Josef Šimánek <josef.simanek@gmail.com> writes:
>>
>> > The only problem I do have currently is auto-detection of perl. I'm
>> > getting error related to missing "Opcode.pm". PERL is autodetected and
>> > enabled (https://pastebin.com/xfRRrDcU).
>>
>> Your Perl (not PERL) installation seems to be incomplete. Opcode.pm is a
>> core module, and should be in /usr/lib64/perl5, judging by the paths in
>> the error message.
>>
>> Which OS is this? Some Linux distributions have separate packages for
>> the interpreter itself and the included modules, and the packages can be
>> named confusingly. E.g. on older Redhat/Fedora versions you have to
>> install the 'perl-core' package to get all the modules, 'perl' is just
>> the interpreter and the bare minimum set of strictily necessary modules.
>>
>> They've fixed this in recent versions (Fedora 34 and Redhat 8, IIRC), so
>> that 'perl' gives you the hole bundle, and 'perl-interpeter' is the
>> minimal one.
>
> I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
> package.`
Yes, it's a separate package, but the 'perl' package depends on all the
core module packages, so installing that should fix things. You appear
to only have 'perl-interpreter' installed.
> Anyway it behaves differently with autoconf tools and the meson build
> system. Is perl disabled by default in the current build system?
configure doesn't auto-detect any optional features, they have to be
explicitly enabled using --with-foo switches.
- ilmari
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:32 ` Re: [RFC] building postgres with meson Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@ 2021-10-14 19:29 ` Josef Šimánek <josef.simanek@gmail.com>
0 siblings, 0 replies; 143+ messages in thread
From: Josef Šimánek @ 2021-10-14 19:29 UTC (permalink / raw)
To: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
čt 14. 10. 2021 v 15:32 odesílatel Dagfinn Ilmari Mannsåker
<ilmari@ilmari.org> napsal:
>
> Josef Šimánek <josef.simanek@gmail.com> writes:
>
> > čt 14. 10. 2021 v 15:14 odesílatel Dagfinn Ilmari Mannsåker
> > <ilmari@ilmari.org> napsal:
> >>
> >> Josef Šimánek <josef.simanek@gmail.com> writes:
> >>
> >> > The only problem I do have currently is auto-detection of perl. I'm
> >> > getting error related to missing "Opcode.pm". PERL is autodetected and
> >> > enabled (https://pastebin.com/xfRRrDcU).
> >>
> >> Your Perl (not PERL) installation seems to be incomplete. Opcode.pm is a
> >> core module, and should be in /usr/lib64/perl5, judging by the paths in
> >> the error message.
> >>
> >> Which OS is this? Some Linux distributions have separate packages for
> >> the interpreter itself and the included modules, and the packages can be
> >> named confusingly. E.g. on older Redhat/Fedora versions you have to
> >> install the 'perl-core' package to get all the modules, 'perl' is just
> >> the interpreter and the bare minimum set of strictily necessary modules.
> >>
> >> They've fixed this in recent versions (Fedora 34 and Redhat 8, IIRC), so
> >> that 'perl' gives you the hole bundle, and 'perl-interpeter' is the
> >> minimal one.
> >
> > I'm using Fedora 34 and I still see perl-Opcode.x86_64 as a separate
> > package.`
>
> Yes, it's a separate package, but the 'perl' package depends on all the
> core module packages, so installing that should fix things. You appear
> to only have 'perl-interpreter' installed.
You're right. Installing "perl" or "perl-Opcode" manually fixes this
problem. Currently I only have "perl-interpreter" installed.
> > Anyway it behaves differently with autoconf tools and the meson build
> > system. Is perl disabled by default in the current build system?
>
> configure doesn't auto-detect any optional features, they have to be
> explicitly enabled using --with-foo switches.
>
> - ilmari
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:21 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Re: [RFC] building postgres with meson Josef Šimánek <josef.simanek@gmail.com>
@ 2021-10-14 17:26 ` Andres Freund <andres@anarazel.de>
1 sibling, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-14 17:26 UTC (permalink / raw)
To: Josef Šimánek <josef.simanek@gmail.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 23:58:12 +0200, Josef Šimánek wrote:
> st 13. 10. 2021 v 1:54 odesílatel Andres Freund <andres@anarazel.de> napsal:
> > This *very* likely is related to building in a source tree that also contains
> > a "non-meson" build "in place". The problem is that the meson build picks up
> > the pg_config.h generated by ./configure in the "normal" build, rather than
> > the one meson generated itself.
> >
> > You'd need to execute make distclean or such, or use a separate git checkout.
> >
> > I forgot about this issue because I only ever build postgres from outside the
> > source-tree (by invoking configure from a separate directory), so there's
> > never build products in it. I think at least I need to make the build emit a
> > warning / error if there's a pg_config.h in the source tree...
>
> Hello, thanks for the hint. I can finally build using meson and run
> regress tests.
I yesterday pushed code that should detect this case (with an error). Should
now detect the situation both when you first run configure in tree, and then
meson, and the other way round (by the dirty hack of ./configure touch'ing
meson.build at the end for in-tree builds).
> The only problem I do have currently is auto-detection of perl. I'm
> getting error related to missing "Opcode.pm". PERL is autodetected and
> enabled (https://pastebin.com/xfRRrDcU).
>
> I do get the same error when I enforce perl for current master build
> (./configure --with-perl). Using ./configure with perl autodetection
> skips plperl extension on my system.
>
> Disabling perl manually for meson build (meson setup build
> --reconfigure --buildtype debug -Dperl=disabled) works for me.
Yay, thanks for testing!
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 15:28 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
11 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 15:28 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; pgsql-hackers
On 10/12/21 4:37 AM, Andres Freund wrote:
> # setup build directory
> meson setup build --buildtype debug
I took this for an outing on msys2 and it just seems to hang. If it's not hanging it's unbelievably slow.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 15:50 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 15:50 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; pgsql-hackers
On 10/12/21 11:28 AM, Andrew Dunstan wrote:
> On 10/12/21 4:37 AM, Andres Freund wrote:
>> # setup build directory
>> meson setup build --buildtype debug
> I took this for an outing on msys2 and it just seems to hang. If it's not hanging it's unbelievably slow.
>
>
It hung because it expected the compiler to be 'ccache cc'. Hanging in
such a case is kinda unforgivable. I remedied that by setting 'CC=gcc'
but it then errored out looking for perl libs. I think msys2 is going to
be a bit difficult here :-(
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 16:59 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:11 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-12 16:59 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 11:50:03 -0400, Andrew Dunstan wrote:
> It hung because it expected the compiler to be 'ccache cc'. Hanging in
> such a case is kinda unforgivable. I remedied that by setting 'CC=gcc'
> but it then errored out looking for perl libs. I think msys2 is going to
> be a bit difficult here :-(
Hm. Yea, the perl thing is my fault - you should be able to get past it with
-Dperl=disabled, and I'll take a look at fixing the perl detection. (*)
I can't reproduce the hanging though. I needed to install bison, flex and
ninja and disable perl as described above, but then it built just fine.
It does seems to crash somewhere in the main regression tests though, I think
I don't do the "set stack depth" dance correctly for msys.
If you repro the hanging, what's the last bit in meson-logs/meson-log.txt?
(*) I've for now made most dependencies autodetected, unless you pass
--auto-features disabled to collectively disable all the auto-detected
features. Initially I had mirrored the autoconf behaviour, but I got sick of
forgetting to turn off readline or zlib on windows. And then it was useful to
test on multiple operating systems...
For working on windows meson's wraps are quite useful. I've not added that to
the git branch, but if you manually do
mkdir subprojects
meson wrap install lz4
meson wrap install zlib
building with -Dzlib=enabled -Dlz4=enabled will fall back to building lz4,
zlib as-needed.
I was wondering about adding a binary wrap for e.g. bison, flex on windows, so
that the process of getting a build going isn't as arduous.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 18:09 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 18:09 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 09:59:26 -0700, Andres Freund wrote:
> On 2021-10-12 11:50:03 -0400, Andrew Dunstan wrote:
> > It hung because it expected the compiler to be 'ccache cc'. Hanging in
> > such a case is kinda unforgivable. I remedied that by setting 'CC=gcc'
> > but it then errored out looking for perl libs. I think msys2 is going to
> > be a bit difficult here :-(
>
> Hm. Yea, the perl thing is my fault - you should be able to get past it with
> -Dperl=disabled, and I'll take a look at fixing the perl detection. (*)
This is a weird one. I don't know much about msys, so it's probably related to
that. Perl spits out /usr/lib/perl5/core_perl/ as its archlibexp. According to
shell commands that exists, but not according to msys's own python
$ /mingw64/bin/python -c "import os; p = '/usr/lib/perl5/core_perl/CORE'; print(f'does {p} exist:', os.path.exists(p))"
does /usr/lib/perl5/core_perl/CORE exist: False
$ ls -ld /usr/lib/perl5/core_perl/CORE
drwxr-xr-x 1 anfreund anfreund 0 Oct 10 10:19 /usr/lib/perl5/core_perl/CORE
So it's not too surprising that that doesn't work out. It's easy enough to
work around, but still pretty weird.
I pushed a workaround for the config-time error, but it doesn't yet recognize
msys perl correctly. But at least it's not alone in that - configure doesn't
seem to either, so I'm probably doing something wrong :)
> I can't reproduce the hanging though. I needed to install bison, flex and
> ninja and disable perl as described above, but then it built just fine.
>
> It does seems to crash somewhere in the main regression tests though, I think
> I don't do the "set stack depth" dance correctly for msys.
That was it - just hadn't ported setting -Wl,--stack=... for !msvc
windows. Pushed the fix for that out.
I guess I should figure out how to commandline install msys and add it to CI.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 18:37 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:16 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 18:37 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 2:09 PM, Andres Freund wrote:
> Hi,
>
> On 2021-10-12 09:59:26 -0700, Andres Freund wrote:
>> On 2021-10-12 11:50:03 -0400, Andrew Dunstan wrote:
>>> It hung because it expected the compiler to be 'ccache cc'. Hanging in
>>> such a case is kinda unforgivable. I remedied that by setting 'CC=gcc'
>>> but it then errored out looking for perl libs. I think msys2 is going to
>>> be a bit difficult here :-(
>> Hm. Yea, the perl thing is my fault - you should be able to get past it with
>> -Dperl=disabled, and I'll take a look at fixing the perl detection. (*)
> This is a weird one. I don't know much about msys, so it's probably related to
> that. Perl spits out /usr/lib/perl5/core_perl/ as its archlibexp. According to
> shell commands that exists, but not according to msys's own python
>
> $ /mingw64/bin/python -c "import os; p = '/usr/lib/perl5/core_perl/CORE'; print(f'does {p} exist:', os.path.exists(p))"
> does /usr/lib/perl5/core_perl/CORE exist: False
>
> $ ls -ld /usr/lib/perl5/core_perl/CORE
> drwxr-xr-x 1 anfreund anfreund 0 Oct 10 10:19 /usr/lib/perl5/core_perl/CORE
Looks to me like a python issue:
# perl -e 'my $p = "/usr/lib/perl5/core_perl/CORE"; print qq(does $p
exist: ), -e $p, qq{\n};'
does /usr/lib/perl5/core_perl/CORE exist: 1
# python -c "import os; p = '/usr/lib/perl5/core_perl/CORE';
print(f'does {p} exist:', os.path.exists(p))"
does /usr/lib/perl5/core_perl/CORE exist: False
# cygpath -m /usr/lib/perl5/core_perl/CORE
C:/tools/msys64/usr/lib/perl5/core_perl/CORE
# python -c "import os; p =
'C:/tools/msys64/usr/lib/perl5/core_perl/CORE'; print(f'does {p}
exist:', os.path.exists(p))"
does C:/tools/msys64/usr/lib/perl5/core_perl/CORE exist: True
Clearly python is not understanding msys virtualized paths.
>
>
> I guess I should figure out how to commandline install msys and add it to CI.
>
here's what I do:
# msys2 outputs esc-[3J which clears the screen's scroll buffer. Nasty.
# so we redirect the output
# find the log in c:\Windows\System32 if needed
choco install -y --no-progress --limit-output msys2 > msys2inst.log
c:\tools\msys64\usr\bin\bash -l
'/c/vfiles/windows-uploads/msys2-packages.sh'
Here's what's in msys-packages.sh:
pacman -S --needed --noconfirm \
base-devel \
msys/git \
msys/ccache \
msys/vim \
msys/perl-Crypt-SSLeay \
mingw-w64-clang-x86_64-toolchain \
mingw-w64-x86_64-toolchain
# could do: pacman -S --needed --noconfirm development
# this is more economical. These should cover most of the things you
might
# want to configure with
pacman -S --needed --noconfirm \
msys/gettext-devel \
msys/icu-devel \
msys/libiconv-devel \
msys/libreadline-devel \
msys/libxml2-devel \
msys/libxslt-devel \
msys/openssl-devel \
msys/zlib-devel
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 19:16 ` Andrew Dunstan <andrew@dunslane.net>
1 sibling, 0 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 19:16 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 2:37 PM, Andrew Dunstan wrote:
> On 10/12/21 2:09 PM, Andres Freund wrote:
>> Hi,
>>
>> On 2021-10-12 09:59:26 -0700, Andres Freund wrote:
>>> On 2021-10-12 11:50:03 -0400, Andrew Dunstan wrote:
>>>> It hung because it expected the compiler to be 'ccache cc'. Hanging in
>>>> such a case is kinda unforgivable. I remedied that by setting 'CC=gcc'
>>>> but it then errored out looking for perl libs. I think msys2 is going to
>>>> be a bit difficult here :-(
>>> Hm. Yea, the perl thing is my fault - you should be able to get past it with
>>> -Dperl=disabled, and I'll take a look at fixing the perl detection. (*)
>> This is a weird one. I don't know much about msys, so it's probably related to
>> that. Perl spits out /usr/lib/perl5/core_perl/ as its archlibexp. According to
>> shell commands that exists, but not according to msys's own python
>>
>> $ /mingw64/bin/python -c "import os; p = '/usr/lib/perl5/core_perl/CORE'; print(f'does {p} exist:', os.path.exists(p))"
>> does /usr/lib/perl5/core_perl/CORE exist: False
>>
>> $ ls -ld /usr/lib/perl5/core_perl/CORE
>> drwxr-xr-x 1 anfreund anfreund 0 Oct 10 10:19 /usr/lib/perl5/core_perl/CORE
>
> Looks to me like a python issue:
>
>
> # perl -e 'my $p = "/usr/lib/perl5/core_perl/CORE"; print qq(does $p
> exist: ), -e $p, qq{\n};'
> does /usr/lib/perl5/core_perl/CORE exist: 1
>
> # python -c "import os; p = '/usr/lib/perl5/core_perl/CORE';
> print(f'does {p} exist:', os.path.exists(p))"
> does /usr/lib/perl5/core_perl/CORE exist: False
>
> # cygpath -m /usr/lib/perl5/core_perl/CORE
> C:/tools/msys64/usr/lib/perl5/core_perl/CORE
>
> # python -c "import os; p =
> 'C:/tools/msys64/usr/lib/perl5/core_perl/CORE'; print(f'does {p}
> exist:', os.path.exists(p))"
> does C:/tools/msys64/usr/lib/perl5/core_perl/CORE exist: True
>
>
> Clearly python is not understanding msys virtualized paths.
It's a matter of which python you use. The one that understands msys
paths is msys/python. The mingw64 packages are normally pure native
windows and so don't understand msys paths. I know it's confusing :-(
# /usr/bin/python -c "import os; p = '/usr/lib/perl5/core_perl/CORE';
print(f'does {p} exist:', os.path.exists(p))"
does /usr/lib/perl5/core_perl/CORE exist: True
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 19:29 ` Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 19:29 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 14:37:04 -0400, Andrew Dunstan wrote:
> On 10/12/21 2:09 PM, Andres Freund wrote:
> >> Hm. Yea, the perl thing is my fault - you should be able to get past it with
> >> -Dperl=disabled, and I'll take a look at fixing the perl detection. (*)
> > This is a weird one. I don't know much about msys, so it's probably related to
> > that. Perl spits out /usr/lib/perl5/core_perl/ as its archlibexp. According to
> > shell commands that exists, but not according to msys's own python
> >
> > $ /mingw64/bin/python -c "import os; p = '/usr/lib/perl5/core_perl/CORE'; print(f'does {p} exist:', os.path.exists(p))"
> > does /usr/lib/perl5/core_perl/CORE exist: False
> >
> > $ ls -ld /usr/lib/perl5/core_perl/CORE
> > drwxr-xr-x 1 anfreund anfreund 0 Oct 10 10:19 /usr/lib/perl5/core_perl/CORE
> Looks to me like a python issue:
> Clearly python is not understanding msys virtualized paths.
Ah, it's a question of the *wrong* python being used :/. I somehow ended up
with both a mingw and an msys python, with the mingw python taking preference
over the msys one. The latter one does understand such paths.
> > I guess I should figure out how to commandline install msys and add it to CI.
> here's what I do:
Thanks!
Does that recipe get you to a build where ./configure --with-perl succeeds?
I see this here:
checking for Perl archlibexp... /usr/lib/perl5/core_perl
checking for Perl privlibexp... /usr/share/perl5/core_perl
checking for Perl useshrplib... true
checking for CFLAGS recommended by Perl... -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__ -D_GNU_SOURCE -march=x86-64 -mtune=generic -O2 -pipe -fwrapv -fno-strict-aliasing -fstack-protector-strong
checking for CFLAGS to compile embedded Perl... -DPERL_USE_SAFE_PUTENV
checking for flags to link embedded Perl... no
configure: error: could not determine flags for linking embedded Perl.
This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
installed.
If I just include perl.h from a test file with gcc using the above flags it
fails to compile:
$ echo '#include <perl.h>' > test.c
$ gcc -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__ -D_GNU_SOURCE -march=x86-64 -mtune=generic -O2 -pipe -fwrapv -fno-strict-aliasing -fstack-protector-strong test.c -c -I /c/dev/msys64/usr/lib/perl5/core_perl/CORE
In file included from test.c:1:
C:/dev/msys64/usr/lib/perl5/core_perl/CORE/perl.h:1003:13: fatal error: sys/wait.h: No such file or directory
1003 | # include <sys/wait.h>
and ldopts bleats
$ perl -MExtUtils::Embed -e ldopts
Warning (mostly harmless): No library found for -lpthread
Warning (mostly harmless): No library found for -ldl
-Wl,--enable-auto-import -Wl,--export-all-symbols -Wl,--enable-auto-image-base -fstack-protector-strong -L/usr/lib/perl5/core_perl/CORE -lperl -lcrypt
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 20:02 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 20:02 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 3:29 PM, Andres Freund wrote:
>
> Does that recipe get you to a build where ./configure --with-perl succeeds?
>
> I see this here:
>
> checking for Perl archlibexp... /usr/lib/perl5/core_perl
> checking for Perl privlibexp... /usr/share/perl5/core_perl
> checking for Perl useshrplib... true
> checking for CFLAGS recommended by Perl... -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__ -D_GNU_SOURCE -march=x86-64 -mtune=generic -O2 -pipe -fwrapv -fno-strict-aliasing -fstack-protector-strong
> checking for CFLAGS to compile embedded Perl... -DPERL_USE_SAFE_PUTENV
> checking for flags to link embedded Perl... no
> configure: error: could not determine flags for linking embedded Perl.
> This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
> installed.
>
> If I just include perl.h from a test file with gcc using the above flags it
> fails to compile:
You need to build against a native perl, like Strawberry or ActiveState.
(I have had mixed success with Strawberry) You do that by putting a path
to it at the start of the PATH. The wrinkle in this is that you need
prove to point to one that understands virtual paths. So you do
something like this:
PATH="/c/perl/bin:$PATH" PROVE=/bin/core_perl/prove configure ...
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 20:42 ` Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 20:42 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 16:02:14 -0400, Andrew Dunstan wrote:
> You need to build against a native perl, like Strawberry or ActiveState.
> (I have had mixed success with Strawberry)
Do you understand why that is needed?
> You do that by putting a path to it at the start of the PATH. The wrinkle in
> this is that you need prove to point to one that understands virtual
> paths. So you do something like this:
>
>
> PATH="/c/perl/bin:$PATH" PROVE=/bin/core_perl/prove configure ...
Oh my.
I'll try that later... I wonder if we could make this easier from our side?
This is a lot of magic to know.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 01:03 ` Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-13 01:03 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 13:42:56 -0700, Andres Freund wrote:
> On 2021-10-12 16:02:14 -0400, Andrew Dunstan wrote:
> > You do that by putting a path to it at the start of the PATH. The wrinkle in
> > this is that you need prove to point to one that understands virtual
> > paths. So you do something like this:
> >
> >
> > PATH="/c/perl/bin:$PATH" PROVE=/bin/core_perl/prove configure ...
>
> Oh my.
>
> I'll try that later... I wonder if we could make this easier from our side?
> This is a lot of magic to know.
I managed to get this working. At first it failed because I don't have
pexports - it's not available inside msys as far as I could tell. And seems to
be unmaintained. But replacing pexports with gendef fixed that.
There's this comment in src/pl/plperl/GNUmakefile
# Perl on win32 ships with import libraries only for Microsoft Visual C++,
# which are not compatible with mingw gcc. Therefore we need to build a
# new import library to link with.
but I seem to be able to link fine without going through that song-and-dance?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 12:55 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-13 12:55 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 9:03 PM, Andres Freund wrote:
> Hi,
>
> On 2021-10-12 13:42:56 -0700, Andres Freund wrote:
>> On 2021-10-12 16:02:14 -0400, Andrew Dunstan wrote:
>>> You do that by putting a path to it at the start of the PATH. The wrinkle in
>>> this is that you need prove to point to one that understands virtual
>>> paths. So you do something like this:
>>>
>>>
>>> PATH="/c/perl/bin:$PATH" PROVE=/bin/core_perl/prove configure ...
>> Oh my.
>>
>> I'll try that later... I wonder if we could make this easier from our side?
>> This is a lot of magic to know.
> I managed to get this working. At first it failed because I don't have
> pexports - it's not available inside msys as far as I could tell. And seems to
> be unmaintained. But replacing pexports with gendef fixed that.
>
> There's this comment in src/pl/plperl/GNUmakefile
>
> # Perl on win32 ships with import libraries only for Microsoft Visual C++,
> # which are not compatible with mingw gcc. Therefore we need to build a
> # new import library to link with.
>
> but I seem to be able to link fine without going through that song-and-dance?
>
It looks like you're not building a native postgres, but rather one
targeted at msys. To build one that's native (i.e. runs without any
presence of msys) you need to do these things before building:
MSYSTEM=MINGW64
MSYSTEM_CHOST=x86_64-w64-mingw32
PATH="/mingw64/bin:$PATH"
pexports will be in the resulting path, and the build will use the
native compiler.
You can use fairywren's config as a guide.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-13 17:26 ` Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-13 17:26 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 08:55:38 -0400, Andrew Dunstan wrote:
> On 10/12/21 9:03 PM, Andres Freund wrote:
> > I managed to get this working. At first it failed because I don't have
> > pexports - it's not available inside msys as far as I could tell. And seems to
> > be unmaintained. But replacing pexports with gendef fixed that.
> >
> > There's this comment in src/pl/plperl/GNUmakefile
> >
> > # Perl on win32 ships with import libraries only for Microsoft Visual C++,
> > # which are not compatible with mingw gcc. Therefore we need to build a
> > # new import library to link with.
> >
> > but I seem to be able to link fine without going through that song-and-dance?
> >
>
>
> It looks like you're not building a native postgres, but rather one
> targeted at msys. To build one that's native (i.e. runs without any
> presence of msys) you need to do these things before building:
>
> MSYSTEM=MINGW64
> MSYSTEM_CHOST=x86_64-w64-mingw32
> PATH="/mingw64/bin:$PATH"
I had a config equivalent to this (slight difference in PATH, but the same gcc
being picked), and I just verified that it still works if I set up PATH like
that. I get a working plperl out of it. Without msys on PATH or such.
where perl526.dll
C:\perl\strawberry-5.26.3.1-64bit\perl\bin\perl526.dll
dumpbin /imports 'C:/Users/anfreund/src/pg-meson/build-mingw/tmp_install/lib/plperl.dll'|grep dll
Dump of file C:\Users\anfreund\src\pg-meson\build-mingw\tmp_install\lib\plperl.dll
KERNEL32.dll
msvcrt.dll
perl526.dll
dumpbin /imports .\build-mingw\tmp_install\bin\postgres.exe|grep dll
ADVAPI32.dll
KERNEL32.dll
msvcrt.dll
Secur32.dll
WLDAP32.dll
WS2_32.dll
do $$elog(NOTICE, "blob");$$ language plperl;
NOTICE: blob
DO
To me this looks like it's a plperl built without the import file recreation,
without being msys dependent?
> pexports will be in the resulting path, and the build will use the
> native compiler.
I don't see pexports anywhere in the msys installation. I can see it available
on sourceforge, and I see a few others asking where to get it from in the
context of msys, and being pointed to manually downloading it.
Seems like we should consider using gendef instead of pexports, given it's
available in msys?
$ pacman -Fy
$ pacman -F gendef.exe
...
mingw64/mingw-w64-x86_64-tools-git 9.0.0.6316.acdc7adc9-1 (mingw-w64-x86_64-toolchain) [installed]
mingw64/bin/gendef.exe
..
$ pacman -F pexports.exe
$ pacman -Fx pexports
<bunch of packages containing smtpexports.h>
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 20:06 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-13 21:46 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 2 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-13 20:06 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/13/21 1:26 PM, Andres Freund wrote:
>
>> pexports will be in the resulting path, and the build will use the
>> native compiler.
> I don't see pexports anywhere in the msys installation. I can see it available
> on sourceforge, and I see a few others asking where to get it from in the
> context of msys, and being pointed to manually downloading it.
Weird. fairywren has it, which means that it must have been removed from
the packages at some stage, fairly recently as fairywren isn't that old.
I just confirmed the absence on a 100% fresh install.
It is in Strawberry's c/bin directory.
>
> Seems like we should consider using gendef instead of pexports, given it's
> available in msys?
Yeah. It's missing on my ancient msys animal (frogmouth), but it doesn't
build --with-perl.
jacana seems to have it.
If you prep a patch I'll test it.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-13 21:46 ` Andres Freund <andres@anarazel.de>
2021-10-13 23:11 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-13 21:46 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 16:06:32 -0400, Andrew Dunstan wrote:
> If you prep a patch I'll test it.
Well, right now I'm wondering if the better fix is to just remove the whole
win32 block. I don't know how far back, but afaict it's not needed. Seems to
have been needed for narwhal at some point, according to 02b61dd08f99. But
narwhal is long dead.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 21:46 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 23:11 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-14 22:19 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-13 23:11 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/13/21 5:46 PM, Andres Freund wrote:
> Hi,
>
> On 2021-10-13 16:06:32 -0400, Andrew Dunstan wrote:
>> If you prep a patch I'll test it.
> Well, right now I'm wondering if the better fix is to just remove the whole
> win32 block. I don't know how far back, but afaict it's not needed. Seems to
> have been needed for narwhal at some point, according to 02b61dd08f99. But
> narwhal is long dead.
>
Ok, I'll test it out.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 21:46 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 23:11 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-14 22:19 ` Andrew Dunstan <andrew@dunslane.net>
0 siblings, 0 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-14 22:19 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/13/21 7:11 PM, Andrew Dunstan wrote:
> On 10/13/21 5:46 PM, Andres Freund wrote:
>> Hi,
>>
>> On 2021-10-13 16:06:32 -0400, Andrew Dunstan wrote:
>>> If you prep a patch I'll test it.
>> Well, right now I'm wondering if the better fix is to just remove the whole
>> win32 block. I don't know how far back, but afaict it's not needed. Seems to
>> have been needed for narwhal at some point, according to 02b61dd08f99. But
>> narwhal is long dead.
>>
> Ok, I'll test it out.
>
confirmed that jacana doesn't need this code to build or test plperl
(all I did was change the test from win32 to win32x). There would still
be work to do to fix the contrib bool_plperl, jsonb_plperl and
hstore_plperl modules.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-02-06 17:06 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2022-02-06 17:06 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/13/21 16:06, Andrew Dunstan wrote:
> On 10/13/21 1:26 PM, Andres Freund wrote:
>>> pexports will be in the resulting path, and the build will use the
>>> native compiler.
>> I don't see pexports anywhere in the msys installation. I can see it available
>> on sourceforge, and I see a few others asking where to get it from in the
>> context of msys, and being pointed to manually downloading it.
>
>
> Weird. fairywren has it, which means that it must have been removed from
> the packages at some stage, fairly recently as fairywren isn't that old.
> I just confirmed the absence on a 100% fresh install.
>
>
> It is in Strawberry's c/bin directory.
>
>
>> Seems like we should consider using gendef instead of pexports, given it's
>> available in msys?
>
> Yeah. It's missing on my ancient msys animal (frogmouth), but it doesn't
> build --with-perl.
>
>
> jacana seems to have it.
>
>
> If you prep a patch I'll test it.
>
>
Here's a patch. I've tested the perl piece on master and it works fine.
It applies cleanly down to 9.4, which is before we got transform modules
(9.5) which fail if we just omit doing this platform-specific piece.
Before that only plpython uses pexports, and we're not committed to
supporting plpython at all on old branches.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
Attachments:
gendef.patch (text/x-patch, 1.5K) download
commit 823b36d98b
Author: Andrew Dunstan <andrew@dunslane.net>
Date: Sun Feb 6 10:53:06 2022 -0500
Use gendef instead of pexports for building windows .def files
Modern msys systems lack pexports but have gendef instead, so use that.
Discussion: https://postgr.es/m/20d4fa3a-e0f1-0ac4-1657-0698ee1c511f@dunslane.net>
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 919d46453f..a2e6410f53 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -48,7 +48,7 @@ lib$(perlwithver).a: $(perlwithver).def
dlltool --dllname $(perlwithver).dll --def $(perlwithver).def --output-lib lib$(perlwithver).a
$(perlwithver).def: $(PERLDLL)
- pexports $^ > $@
+ gendef - $^ > $@
endif # win32
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 9e95285af8..a83ae8865c 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -69,7 +69,7 @@ libpython${pytverstr}.a: python${pytverstr}.def
dlltool --dllname python${pytverstr}.dll --def python${pytverstr}.def --output-lib libpython${pytverstr}.a
python${pytverstr}.def:
- pexports $(PYTHONDLL) > $@
+ gendef - $(PYTHONDLL) > $@
endif # win32
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 1e7740da3f..25e65189b6 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -46,7 +46,7 @@ lib$(tclwithver).a: $(tclwithver).def
dlltool --dllname $(tclwithver).dll --def $(tclwithver).def --output-lib lib$(tclwithver).a
$(tclwithver).def: $(TCLDLL)
- pexports $^ > $@
+ gendef - $^ > $@
endif # win32
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-02-06 18:39 ` Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-02-06 18:39 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2022-02-06 12:06:41 -0500, Andrew Dunstan wrote:
> Here's a patch. I've tested the perl piece on master and it works fine.
> It applies cleanly down to 9.4, which is before we got transform modules
> (9.5) which fail if we just omit doing this platform-specific piece.
Given https://postgr.es/m/34e972bc-6e75-0754-9e6d-cde2518773a1%40dunslane.net
wouldn't it make sense to simply remove the pexports/gendef logic instead of
moving to gendef?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-02-06 20:57 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2022-02-06 20:57 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 2/6/22 13:39, Andres Freund wrote:
> Hi,
>
> On 2022-02-06 12:06:41 -0500, Andrew Dunstan wrote:
>> Here's a patch. I've tested the perl piece on master and it works fine.
>> It applies cleanly down to 9.4, which is before we got transform modules
>> (9.5) which fail if we just omit doing this platform-specific piece.
> Given https://postgr.es/m/34e972bc-6e75-0754-9e6d-cde2518773a1%40dunslane.net
> wouldn't it make sense to simply remove the pexports/gendef logic instead of
> moving to gendef?
>
I haven't found a way to fix the transform builds if we do that. So
let's leave that as a separate exercise unless you have a solution for
that - this patch is really trivial.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-02-10 17:00 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2022-02-10 17:00 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 2/6/22 15:57, Andrew Dunstan wrote:
> On 2/6/22 13:39, Andres Freund wrote:
>> Hi,
>>
>> On 2022-02-06 12:06:41 -0500, Andrew Dunstan wrote:
>>> Here's a patch. I've tested the perl piece on master and it works fine.
>>> It applies cleanly down to 9.4, which is before we got transform modules
>>> (9.5) which fail if we just omit doing this platform-specific piece.
>> Given https://postgr.es/m/34e972bc-6e75-0754-9e6d-cde2518773a1%40dunslane.net
>> wouldn't it make sense to simply remove the pexports/gendef logic instead of
>> moving to gendef?
>>
> I haven't found a way to fix the transform builds if we do that. So
> let's leave that as a separate exercise unless you have a solution for
> that - this patch is really trivial.
>
>
Any objection to my moving ahead with this? My current workaround is this:
cat > /usr/bin/pexports <<EOF
#!/bin/sh
/ucrt64/bin/gendef - "$@"
EOF
chmod +x /usr/bin/pexports
(gendef is available in the ucrt64/mingw-w64-ucrt-x86_64-tools-git
package on msys2)
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-02-10 17:52 ` Andres Freund <andres@anarazel.de>
2022-02-10 19:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-02-10 17:52 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2022-02-10 12:00:16 -0500, Andrew Dunstan wrote:
> Any objection to my moving ahead with this?
No. I don't yet understand what the transforms issue is and whether it can be
avoidded, but clearly it's an improvement to be able to build with builtin
msys tools vs not...
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-02-10 19:06 ` Andrew Dunstan <andrew@dunslane.net>
2022-03-07 13:56 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2022-02-10 19:06 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 2/10/22 12:52, Andres Freund wrote:
> Hi,
>
> On 2022-02-10 12:00:16 -0500, Andrew Dunstan wrote:
>> Any objection to my moving ahead with this?
> No. I don't yet understand what the transforms issue is and whether it can be
> avoidded, but clearly it's an improvement to be able to build with builtin
> msys tools vs not...
OK, thanks, done.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-10 19:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-03-07 13:56 ` Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2022-03-07 17:58 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Peter Eisentraut @ 2022-03-07 13:56 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Is there a current patch set to review in this thread at the moment?
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-10 19:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-03-07 13:56 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
@ 2022-03-07 17:58 ` Andres Freund <andres@anarazel.de>
2022-03-08 02:57 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-03-07 17:58 UTC (permalink / raw)
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2022-03-07 14:56:24 +0100, Peter Eisentraut wrote:
> Is there a current patch set to review in this thread at the moment?
I've been regularly rebasing and improving the patchset, but didn't post to
the thread about it most of the time.
I've just pushed another rebase, will work to squash it into a reasonable
number of patches and then repost that.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-02-10 19:06 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2022-03-07 13:56 ` Re: [RFC] building postgres with meson Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2022-03-07 17:58 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-03-08 02:57 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-03-08 02:57 UTC (permalink / raw)
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>; +Cc: pgsql-hackers
On 2022-03-07 09:58:41 -0800, Andres Freund wrote:
> On 2022-03-07 14:56:24 +0100, Peter Eisentraut wrote:
> > Is there a current patch set to review in this thread at the moment?
>
> I've been regularly rebasing and improving the patchset, but didn't post to
> the thread about it most of the time.
>
> I've just pushed another rebase, will work to squash it into a reasonable
> number of patches and then repost that.
Now done, see https://postgr.es/m/20220308025629.3xh2yo4sau74oafo%40alap3.anarazel.de
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 18:11 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 18:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 18:11 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 12:59 PM, Andres Freund wrote:
>
>
> If you repro the hanging, what's the last bit in meson-logs/meson-log.txt?
Here's the entire thing
# cat
C:/tools/msys64/home/Administrator/postgresql/build/meson-logs/meson-log.txt
Build started at 2021-10-12T18:08:34.387568
Main binary: C:/tools/msys64/mingw64/bin/python.exe
Build Options: -Dbuildtype=debug
Python system: Windows
The Meson build system
Version: 0.59.1
Source dir: C:/tools/msys64/home/Administrator/postgresql
Build dir: C:/tools/msys64/home/Administrator/postgresql/build
Build type: native build
Project name: postgresql
Project version: 15devel
Sanity testing C compiler: ccache cc
Is cross compiler: False.
Sanity check compiler command line: ccache cc sanitycheckc.c -o
sanitycheckc.exe -D_FILE_OFFSET_BITS=64
Sanity check compile stdout:
-----
Sanity check compile stderr:
-----
meson.build:1:0: ERROR: Compiler ccache cc can not compile programs.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:11 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2021-10-12 18:23 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:42 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 18:23 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 14:11:39 -0400, Andrew Dunstan wrote:
> On 10/12/21 12:59 PM, Andres Freund wrote:
> > If you repro the hanging, what's the last bit in meson-logs/meson-log.txt?
> Here's the entire thing
> Sanity check compiler command line: ccache cc sanitycheckc.c -o
> sanitycheckc.exe -D_FILE_OFFSET_BITS=64
> Sanity check compile stdout:
>
> -----
> Sanity check compile stderr:
>
> -----
>
> meson.build:1:0: ERROR: Compiler ccache cc can not compile programs.
Huh, it's not a question of gcc vs cc, it's that meson automatically uses
ccache. And it looks like msys's ccache is broken at the moment (installed
yesterday):
$ ccache --version
ccache version 4.4.1
...
$ echo > test.c
$ ccache cc -c test.c
Segmentation fault (core dumped)
..
not sure how that leads to hanging, but it's not too surprising that things
don't work out after that...
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 18:11 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
2021-10-12 18:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 18:42 ` Andrew Dunstan <andrew@dunslane.net>
0 siblings, 0 replies; 143+ messages in thread
From: Andrew Dunstan @ 2021-10-12 18:42 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On 10/12/21 2:23 PM, Andres Freund wrote:
> Hi,
>
> On 2021-10-12 14:11:39 -0400, Andrew Dunstan wrote:
>> On 10/12/21 12:59 PM, Andres Freund wrote:
>>> If you repro the hanging, what's the last bit in meson-logs/meson-log.txt?
>> Here's the entire thing
>> Sanity check compiler command line: ccache cc sanitycheckc.c -o
>> sanitycheckc.exe -D_FILE_OFFSET_BITS=64
>> Sanity check compile stdout:
>>
>> -----
>> Sanity check compile stderr:
>>
>> -----
>>
>> meson.build:1:0: ERROR: Compiler ccache cc can not compile programs.
> Huh, it's not a question of gcc vs cc, it's that meson automatically uses
> ccache. And it looks like msys's ccache is broken at the moment (installed
> yesterday):
>
> $ ccache --version
> ccache version 4.4.1
> ...
>
> $ echo > test.c
> $ ccache cc -c test.c
> Segmentation fault (core dumped)
> ..
>
> not sure how that leads to hanging, but it's not too surprising that things
> don't work out after that...
>
Yes, I've had to disable ccache on fairywren.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-12 19:55 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-21 21:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
11 siblings, 2 replies; 143+ messages in thread
From: John Naylor @ 2021-10-12 19:55 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Tue, Oct 12, 2021 at 4:37 AM Andres Freund <andres@anarazel.de> wrote:
[Meson prototype]
The build code looks pretty approachable for someone with no prior
exposure, and feels pretty nice when running it (I couldn't get a build
working but I'll leave that aside for now).
> As far as I can tell the only OS that postgres currently supports that
> meson doesn't support is HPUX. It'd likely be fairly easy to add
> gcc-on-hpux support, a chunk more to add support for the proprietary
> ones.
That would also have to work for all the dependencies, which were displayed
to me as:
ninja, gdbm, ca-certificates, openssl@1.1, readline, sqlite and python@3.9
Also, could utility makefile targets be made to work? I'm thinking in
particular of update-unicode and reformat-dat-files, for example.
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-12 20:59 ` Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-12 20:59 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 15:55:22 -0400, John Naylor wrote:
> On Tue, Oct 12, 2021 at 4:37 AM Andres Freund <andres@anarazel.de> wrote:
> The build code looks pretty approachable for someone with no prior
> exposure, and feels pretty nice when running it
That's part of what attracted me...
> (I couldn't get a build working but I'll leave that aside for now).
If you want to do that separately, I'll try to fix it.
> > As far as I can tell the only OS that postgres currently supports that
> > meson doesn't support is HPUX. It'd likely be fairly easy to add
> > gcc-on-hpux support, a chunk more to add support for the proprietary
> > ones.
>
> That would also have to work for all the dependencies, which were displayed
> to me as:
>
> ninja, gdbm, ca-certificates, openssl@1.1, readline, sqlite and python@3.9
meson does depend on ninja (to execute the build) and of course python. But
the rest should be optional dependencies. ninja builds without any
dependencies as long as you don't change its parser sources. python builds on
aix, hpux etc.
Not sure what way gdbm openssl@1.1 and sqlite are pulled in? I assume readline
is for python...
> Also, could utility makefile targets be made to work? I'm thinking in
> particular of update-unicode and reformat-dat-files, for example.
Yes, that shouldn't be a problem. You can run arbitrary code in targets
(there's plenty need for that already in what I have so far).
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 15:51 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 04:27 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
0 siblings, 2 replies; 143+ messages in thread
From: John Naylor @ 2021-10-13 15:51 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Tue, Oct 12, 2021 at 4:59 PM Andres Freund <andres@anarazel.de> wrote:
> On 2021-10-12 15:55:22 -0400, John Naylor wrote:
> > (I couldn't get a build working but I'll leave that aside for now).
>
> If you want to do that separately, I'll try to fix it.
Okay, I pulled the latest commits and tried again:
[51/950] Compiling C object
src/interfaces/libpq/libpq.5.dylib.p/fe-connect.c.o
FAILED: src/interfaces/libpq/libpq.5.dylib.p/fe-connect.c.o
ccache cc -Isrc/interfaces/libpq/libpq.5.dylib.p -Isrc/interfaces/libpq
-I../src/interfaces/libpq -Isrc/port -I../src/port -Isrc/include
-I../src/include
-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers
-I/usr/local/opt/readline/include -I/usr/local/opt/gettext/include
-I/usr/local/opt/zlib/include -I/usr/local/opt/openssl/include
-fcolor-diagnostics -Wall -Winvalid-pch -Wextra -O0 -g -isysroot
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -fno-strict-aliasing
-fwrapv -Wmissing-prototypes -Wpointer-arith -Werror=vla -Wendif-labels
-Wmissing-format-attribute -Wformat-security -Wdeclaration-after-statement
-Wno-unused-command-line-argument -Wno-missing-field-initializers
-Wno-sign-compare -Wno-unused-parameter -msse4.2
-F/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework
-DFRONTEND -MD -MQ src/interfaces/libpq/libpq.5.dylib.p/fe-connect.c.o -MF
src/interfaces/libpq/libpq.5.dylib.p/fe-connect.c.o.d -o
src/interfaces/libpq/libpq.5.dylib.p/fe-connect.c.o -c
../src/interfaces/libpq/fe-connect.c
In file included from ../src/interfaces/libpq/fe-connect.c:72:
In file included from
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers/ldap.h:1:
[the last line is repeated a bunch of times, then...]
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers/ldap.h:1:10:
error: #include nested too deeply
#include <ldap.h>
^
Then the expected "undeclared identifier" errors that would arise from a
missing header. I tried compiling --with-ldap with the Make build, and only
got warnings about deprecated declarations -- that build completed.
I tried disabling ldap with the Meson build but I'll spare the details of
what went wrong there in case I did something wrong, so we can take things
one step at a time.
> > That would also have to work for all the dependencies, which were
displayed
> > to me as:
> >
> > ninja, gdbm, ca-certificates, openssl@1.1, readline, sqlite and
python@3.9
>
> meson does depend on ninja (to execute the build) and of course python.
But
> the rest should be optional dependencies. ninja builds without any
> dependencies as long as you don't change its parser sources. python
builds on
> aix, hpux etc.
>
> Not sure what way gdbm openssl@1.1 and sqlite are pulled in? I assume
readline
> is for python...
Hmm, weird.
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-13 16:37 ` Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-13 16:37 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 11:51:03 -0400, John Naylor wrote:
> On Tue, Oct 12, 2021 at 4:59 PM Andres Freund <andres@anarazel.de> wrote:
>
> > On 2021-10-12 15:55:22 -0400, John Naylor wrote:
> > > (I couldn't get a build working but I'll leave that aside for now).
> >
> > If you want to do that separately, I'll try to fix it.
>
> Okay, I pulled the latest commits and tried again:
> /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers/ldap.h:1:
>
> [the last line is repeated a bunch of times, then...]
Oh. I actually saw that on CI at some point... That one is definitely
odd. Currently CI for OSX builds like
- brew install make coreutils ccache icu4c lz4 tcl-tk openldap
- brew install meson ninja python@3.9
..
PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="/usr/local/opt/openldap/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH
meson setup --buildtype debug -Dcassert=true -Dssl=openssl build
but I set that up knowing little about macos.
For the autoconf build CI currently does something similar via
LIBS="/usr/local/lib:$LIBS"
INCLUDES="/usr/local/include:$INCLUDES"
...
LIBS="/usr/local/opt/openldap/lib:$LIBS"
INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
...
--with-includes="$INCLUDES" \
--with-libs="$LIBS" \
are you doing something like that? Or does it work for you without? I vaguely
recall hitting a similar problem as you report when not passing
/usr/local/... to configure.
> i tried disabling ldap with the meson build but i'll spare the details of
> what went wrong there in case i did something wrong, so we can take things
> one step at a time.
you can change it for an existing builddir with
meson configure -dldap=disabled or when setting up a new builddir by passing
-dldap=disabled at that time.
> > > ninja, gdbm, ca-certificates, openssl@1.1, readline, sqlite and
> python@3.9
> >
> > meson does depend on ninja (to execute the build) and of course python.
> but
> > the rest should be optional dependencies. ninja builds without any
> > dependencies as long as you don't change its parser sources. python
> builds on
> > aix, hpux etc.
> >
> > not sure what way gdbm openssl@1.1 and sqlite are pulled in? i assume
> readline
> > is for python...
>
> Hmm, weird.
They're homebrew python deps: https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/python@3.9.rb#L28
which are optional things enabled explicitly:
https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/python@3.9.rb#L123
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 17:19 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-13 17:19 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Wed, Oct 13, 2021 at 12:37 PM Andres Freund <andres@anarazel.de> wrote:
> For the autoconf build CI currently does something similar via
> LIBS="/usr/local/lib:$LIBS"
> INCLUDES="/usr/local/include:$INCLUDES"
> ...
> LIBS="/usr/local/opt/openldap/lib:$LIBS"
> INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
> ...
> --with-includes="$INCLUDES" \
> --with-libs="$LIBS" \
>
> are you doing something like that? Or does it work for you without? I
vaguely
> recall hitting a similar problem as you report when not passing
> /usr/local/... to configure.
I didn't do anything like that for the autoconf build. I have in the past
done things retail, like
--with-icu ICU_CFLAGS='-I/usr/local/opt/icu4c/include/'
ICU_LIBS='-L/usr/local/opt/icu4c/lib/ -licui18n -licuuc -licudata'
> > i tried disabling ldap with the meson build but i'll spare the details
of
> > what went wrong there in case i did something wrong, so we can take
things
> > one step at a time.
>
> you can change it for an existing builddir with
> meson configure -dldap=disabled or when setting up a new builddir by
passing
> -dldap=disabled at that time.
Somehow our emails got lower-cased down here, but I tried it with capital D:
meson configure -Dldap=disabled
inside the build dir and got this:
../meson.build:278:2: ERROR: Tried to assign the invalid value "None" of
type NoneType to variable.
Line 278 is
ldap_r = ldap = dependency('', required : false)
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-13 17:42 ` Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-13 17:42 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-13 13:19:36 -0400, John Naylor wrote:
> On Wed, Oct 13, 2021 at 12:37 PM Andres Freund <andres@anarazel.de> wrote:
>
> > For the autoconf build CI currently does something similar via
> > LIBS="/usr/local/lib:$LIBS"
> > INCLUDES="/usr/local/include:$INCLUDES"
> > ...
> > LIBS="/usr/local/opt/openldap/lib:$LIBS"
> > INCLUDES="/usr/local/opt/openldap/include:$INCLUDES"
> > ...
> > --with-includes="$INCLUDES" \
> > --with-libs="$LIBS" \
> >
> > are you doing something like that? Or does it work for you without? I
> vaguely
> > recall hitting a similar problem as you report when not passing
> > /usr/local/... to configure.
>
> I didn't do anything like that for the autoconf build. I have in the past
> done things retail, like
I'll try to see how this works / what causes the breakage.
> Somehow our emails got lower-cased down here, but I tried it with capital D:
:)
> meson configure -Dldap=disabled
>
> inside the build dir and got this:
>
> ../meson.build:278:2: ERROR: Tried to assign the invalid value "None" of
> type NoneType to variable.
>
> Line 278 is
>
> ldap_r = ldap = dependency('', required : false)
Oops, I broke that when trying to clean things up. I guess I write too much C
;). It needs to be two lines.
I pushed the fix for that.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-13 18:40 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-13 18:40 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Wed, Oct 13, 2021 at 1:42 PM Andres Freund <andres@anarazel.de> wrote:
> I pushed the fix for that.
Ok great, it builds now! :-) Now something's off with dynamic loading.
There are libraries in ./tmp_install/usr/local/lib/ but apparently initdb
doesn't know to look for them there:
$ cat /Users/john/pgdev/meson/build/testrun/main/pg_regress/log/initdb.log
dyld: Library not loaded: /usr/local/lib/libpq.5.dylib
Referenced from:
/Users/john/pgdev/meson/build/tmp_install/usr/local/bin/initdb
Reason: image not found
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 19:14 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-14 19:14 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
I wrote:
> Ok great, it builds now! :-) Now something's off with dynamic loading.
There are libraries in ./tmp_install/usr/local/lib/ but apparently initdb
doesn't know to look for them there:
>
> $ cat /Users/john/pgdev/meson/build/testrun/main/pg_regress/log/initdb.log
> dyld: Library not loaded: /usr/local/lib/libpq.5.dylib
> Referenced from:
/Users/john/pgdev/meson/build/tmp_install/usr/local/bin/initdb
> Reason: image not found
After poking a bit more, this only happens when trying to run the tests. If
I specify a prefix, I can install, init, and start the server just fine, so
that much works.
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 20:34 ` Andres Freund <andres@anarazel.de>
2021-10-14 20:54 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-14 20:34 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On October 14, 2021 12:14:16 PM PDT, John Naylor <john.naylor@enterprisedb.com> wrote:
>I wrote:
>
>> Ok great, it builds now! :-) Now something's off with dynamic loading.
>There are libraries in ./tmp_install/usr/local/lib/ but apparently initdb
>doesn't know to look for them there:
>>
>> $ cat /Users/john/pgdev/meson/build/testrun/main/pg_regress/log/initdb.log
>> dyld: Library not loaded: /usr/local/lib/libpq.5.dylib
>> Referenced from:
>/Users/john/pgdev/meson/build/tmp_install/usr/local/bin/initdb
>> Reason: image not found
>
>After poking a bit more, this only happens when trying to run the tests. If
>I specify a prefix, I can install, init, and start the server just fine, so
>that much works.
Is this a Mac with SIP enabled? The Mac CI presumably has that disabled, which is why I didn't see this issue there. Probably need to implement whatever Tom figured out to do about that for the current way of running tests.
Andres
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 20:54 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:16 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:41 ` Re: [RFC] building postgres with meson Sergey Shinderuk <s.shinderuk@postgrespro.ru>
1 sibling, 2 replies; 143+ messages in thread
From: John Naylor @ 2021-10-14 20:54 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Thu, Oct 14, 2021 at 4:34 PM Andres Freund <andres@anarazel.de> wrote:
> Is this a Mac with SIP enabled? The Mac CI presumably has that disabled,
which is why I didn't see this issue there. Probably need to implement
whatever Tom figured out to do about that for the current way of running
tests.
System Information says it's disabled. Running "csrutil status" complains
of an unsupported configuration, which doesn't sound good, so I should
probably go fix that independent of anything else. :-/
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 20:54 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 21:16 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:48 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-14 21:16 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
I wrote:
> > Is this a Mac with SIP enabled? The Mac CI presumably has that
disabled, which is why I didn't see this issue there. Probably need to
implement whatever Tom figured out to do about that for the current way of
running tests.
>
> System Information says it's disabled. Running "csrutil status" complains
of an unsupported configuration, which doesn't sound good, so I should
probably go fix that independent of anything else. :-/
Looking online, I wonder if the "unsupported" message might be overly
cautious. In any case, I do remember turning something off to allow a
debugger to run. Here are all the settings, in case it matters:
Apple Internal: disabled
Kext Signing: enabled
Filesystem Protections: enabled
Debugging Restrictions: disabled
DTrace Restrictions: enabled
NVRAM Protections: enabled
BaseSystem Verification: enabled
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 20:54 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:16 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 21:48 ` Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 0 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-14 21:48 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
John Naylor <john.naylor@enterprisedb.com> writes:
>> System Information says it's disabled. Running "csrutil status" complains
>> of an unsupported configuration, which doesn't sound good, so I should
>> probably go fix that independent of anything else. :-/
> Looking online, I wonder if the "unsupported" message might be overly
> cautious. In any case, I do remember turning something off to allow a
> debugger to run. Here are all the settings, in case it matters:
> Apple Internal: disabled
> Kext Signing: enabled
> Filesystem Protections: enabled
> Debugging Restrictions: disabled
> DTrace Restrictions: enabled
> NVRAM Protections: enabled
> BaseSystem Verification: enabled
I remember having seen that report too, after some previous software
upgrade that had started from a "SIP disabled" status. I'm mostly
guessing here, but my guess is that
(a) csrutil only considers the all-enabled and all-disabled states
of these individual flags to be "supported" cases.
(b) some one or more of these flags came along in a macOS update,
and if you did the update starting from a "disabled" state, you
nonetheless ended up with the new flags enabled, leading to the
mixed state that csrutil complains about.
I've lost count of the number of times I've seen macOS updates
be sloppy about preserving non-default settings, so I don't find
theory (b) to be even slightly surprising.
Whether the mixed state is actually problematic in any way,
I dunno. I don't recall having had any problems before noticing
that that was what I had.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 20:54 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 21:41 ` Sergey Shinderuk <s.shinderuk@postgrespro.ru>
1 sibling, 0 replies; 143+ messages in thread
From: Sergey Shinderuk @ 2021-10-14 21:41 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
Hi,
On 14.10.2021 23:54, John Naylor wrote:
> On Thu, Oct 14, 2021 at 4:34 PM Andres Freund <andres@anarazel.de
> <mailto:andres@anarazel.de>> wrote:
>
> > Is this a Mac with SIP enabled? The Mac CI presumably has that
> disabled, which is why I didn't see this issue there. Probably need to
> implement whatever Tom figured out to do about that for the current way
> of running tests.
>
> System Information says it's disabled. Running "csrutil status"
> complains of an unsupported configuration, which doesn't sound good, so
> I should probably go fix that independent of anything else. :-/
Maybe you could check that DYLD_LIBRARY_PATH is working for you?
% DYLD_FALLBACK_LIBRARY_PATH=
DYLD_LIBRARY_PATH=./tmp_install/usr/local/lib
./tmp_install/usr/local/bin/psql --version
psql (PostgreSQL) 15devel
Without DYLD_LIBRARY_PATH I get the error, as expected:
% DYLD_FALLBACK_LIBRARY_PATH= ./tmp_install/usr/local/bin/psql --version
dyld: Library not loaded: /usr/local/lib/libpq.5.dylib
Referenced from:
/Users/shinderuk/src/postgres-meson/build/./tmp_install/usr/local/bin/psql
Reason: image not found
I add "DYLD_FALLBACK_LIBRARY_PATH=" because otherwise dyld falls back to
/usr/lib/libpq.5.dylib provided by Apple (I am testing on Catalina).
% DYLD_PRINT_LIBRARIES=1 ./tmp_install/usr/local/bin/psql --version 2>&1
| grep libpq
dyld: loaded: <4EDF735E-2104-32AD-BE7B-B400ABFCF57C> /usr/lib/libpq.5.dylib
Regards,
--
Sergey Shinderuk https://postgrespro.com/
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 22:00 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:55 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 2 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-14 22:00 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> Is this a Mac with SIP enabled? The Mac CI presumably has that disabled, which is why I didn't see this issue there. Probably need to implement whatever Tom figured out to do about that for the current way of running tests.
AFAIR the only cases we've made work are
(1) disable SIP
(2) avoid the need for (1) by always doing "make install" before
"make check".
Peter E. did some hacking towards another solution awhile ago,
but IIRC it involved changing the built binaries, and I think
we concluded that the benefits didn't justify that.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-14 22:23 ` Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 2 replies; 143+ messages in thread
From: Thomas Munro @ 2021-10-14 22:23 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Andres Freund <andres@anarazel.de>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
On Fri, Oct 15, 2021 at 11:00 AM Tom Lane <tgl@sss.pgh.pa.us> wrote:
> Peter E. did some hacking towards another solution awhile ago,
> but IIRC it involved changing the built binaries, and I think
> we concluded that the benefits didn't justify that.
Yeah, by now there are lots of useful blogs from various projects
figuring out that you can use the install_name_tool to adjust the
paths it uses to be absolute or relative to certain magic words, like
@executable_path/../lib/blah.dylib, which is tempting, but...
realistically, for serious hacking on a Mac, SIP is so annoying that
it isn't the only reason you'll want to turn it off: it stops
dtrace/dtruss/... from working, and somehow prevents debuggers from
working when you've ssh'd in from a remote machine with a proper
keyboard, and probably more things that I'm forgetting.
I wish I could find the Xnu source that shows exactly how and when the
environment is suppressed in this way to understand better, but it
doesn't jump out of Apple's github; maybe it's hiding in closed source
machinery...
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
@ 2021-10-14 22:40 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:04 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-14 22:40 UTC (permalink / raw)
To: Thomas Munro <thomas.munro@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Thomas Munro <thomas.munro@gmail.com> writes:
> I wish I could find the Xnu source that shows exactly how and when the
> environment is suppressed in this way to understand better, but it
> doesn't jump out of Apple's github; maybe it's hiding in closed source
> machinery...
I recall that we figured out awhile ago that the environment gets trimmed
when make (or whatever) executes some command via the shell; seemingly,
Apple has decided that /bin/sh is a security-critical program that mustn't
be run with a non-default DYLD_LIBRARY_PATH. Dunno if that helps you
find where the damage is done exactly.
(The silliness of this policy, when you pair it with the fact that they
don't reset PATH at the same time, seems blindingly obvious to me. But
apparently not to Apple.)
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-14 23:04 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 00:36 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-14 23:04 UTC (permalink / raw)
To: Thomas Munro <thomas.munro@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
I wrote:
> I recall that we figured out awhile ago that the environment gets trimmed
> when make (or whatever) executes some command via the shell; seemingly,
> Apple has decided that /bin/sh is a security-critical program that mustn't
> be run with a non-default DYLD_LIBRARY_PATH. Dunno if that helps you
> find where the damage is done exactly.
BTW, here's the evidence for this theory:
[tgl@pro ~]$ cat checkenv.c
#include <stdio.h>
#include <stdlib.h>
int
main(int argc, char **argv)
{
char *pth = getenv("DYLD_LIBRARY_PATH");
if (pth)
printf("DYLD_LIBRARY_PATH = %s\n", pth);
else
printf("DYLD_LIBRARY_PATH is unset\n");
return 0;
}
[tgl@pro ~]$ gcc checkenv.c
[tgl@pro ~]$ ./a.out
DYLD_LIBRARY_PATH is unset
[tgl@pro ~]$ export DYLD_LIBRARY_PATH=/Users/tgl/pginstall/lib
[tgl@pro ~]$ ./a.out
DYLD_LIBRARY_PATH = /Users/tgl/pginstall/lib
[tgl@pro ~]$ sh -c ./a.out
DYLD_LIBRARY_PATH is unset
[tgl@pro ~]$ ./a.out
DYLD_LIBRARY_PATH = /Users/tgl/pginstall/lib
[tgl@pro ~]$ bash -c ./a.out
DYLD_LIBRARY_PATH is unset
You have to check the environment using an "unprivileged" program.
If you try to examine the environment using, say, "env", you will get
very misleading results. AFAICT, /usr/bin/env is *also* considered
security-critical, because I cannot get it to ever report that
DYLD_LIBRARY_PATH is set.
Hmm ... /usr/bin/perl seems to act the same way. It can see
ENV{'PATH'} but not ENV{'DYLD_LIBRARY_PATH'}.
This may indicate that they've applied this policy on a blanket
basis to everything in /bin and /usr/bin (and other system
directories, maybe), rather than singling out the shell.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:04 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-15 00:36 ` Thomas Munro <thomas.munro@gmail.com>
2021-10-15 02:46 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: Thomas Munro @ 2021-10-15 00:36 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Andres Freund <andres@anarazel.de>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
On Fri, Oct 15, 2021 at 12:04 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
> [tgl@pro ~]$ cat checkenv.c
> #include <stdio.h>
> #include <stdlib.h>
>
> int
> main(int argc, char **argv)
> {
> char *pth = getenv("DYLD_LIBRARY_PATH");
>
> if (pth)
> printf("DYLD_LIBRARY_PATH = %s\n", pth);
> else
> printf("DYLD_LIBRARY_PATH is unset\n");
>
> return 0;
> }
> [tgl@pro ~]$ gcc checkenv.c
> [tgl@pro ~]$ ./a.out
> DYLD_LIBRARY_PATH is unset
> [tgl@pro ~]$ export DYLD_LIBRARY_PATH=/Users/tgl/pginstall/lib
> [tgl@pro ~]$ ./a.out
> DYLD_LIBRARY_PATH = /Users/tgl/pginstall/lib
> [tgl@pro ~]$ sh -c ./a.out
> DYLD_LIBRARY_PATH is unset
> [tgl@pro ~]$ ./a.out
> DYLD_LIBRARY_PATH = /Users/tgl/pginstall/lib
> [tgl@pro ~]$ bash -c ./a.out
> DYLD_LIBRARY_PATH is unset
>
> You have to check the environment using an "unprivileged" program.
> If you try to examine the environment using, say, "env", you will get
> very misleading results. AFAICT, /usr/bin/env is *also* considered
> security-critical, because I cannot get it to ever report that
> DYLD_LIBRARY_PATH is set.
>
> Hmm ... /usr/bin/perl seems to act the same way. It can see
> ENV{'PATH'} but not ENV{'DYLD_LIBRARY_PATH'}.
>
> This may indicate that they've applied this policy on a blanket
> basis to everything in /bin and /usr/bin (and other system
> directories, maybe), rather than singling out the shell.
Looks like it. If I've found the right code here, it looks like where
any common-or-garden Unix runtime linker would ignore LD_LIBRARY_PATH
for a setuid binary, they've trained theirs to whack DYLD_*, and also
for code-signed and __RESTRICT-marked executables.
https://github.com/opensource-apple/dyld/blob/master/src/dyld.cpp#L1681
I suppose you could point SHELL at an unsigned copy of sh (codesign
--remove-signature, or something from brew/ports/x) so that GNU make
should respect, but I don't know how many other exec("/bin/sh") calls
might be hiding around the place (I guess perl calls system()?) and
might require some kind of LD_PRELOAD hackery... not much fun.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:04 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 00:36 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
@ 2021-10-15 02:46 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 03:20 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-15 02:46 UTC (permalink / raw)
To: Thomas Munro <thomas.munro@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Thomas Munro <thomas.munro@gmail.com> writes:
> On Fri, Oct 15, 2021 at 12:04 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
>> This may indicate that they've applied this policy on a blanket
>> basis to everything in /bin and /usr/bin (and other system
>> directories, maybe), rather than singling out the shell.
> Looks like it. If I've found the right code here, it looks like where
> any common-or-garden Unix runtime linker would ignore LD_LIBRARY_PATH
> for a setuid binary, they've trained theirs to whack DYLD_*, and also
> for code-signed and __RESTRICT-marked executables.
> https://github.com/opensource-apple/dyld/blob/master/src/dyld.cpp#L1681
Ugh. That explains it, all right.
> I suppose you could point SHELL at an unsigned copy of sh (codesign
> --remove-signature, or something from brew/ports/x) so that GNU make
> should respect, but I don't know how many other exec("/bin/sh") calls
> might be hiding around the place (I guess perl calls system()?) and
> might require some kind of LD_PRELOAD hackery... not much fun.
Yeah. I thought about invoking everything via a small wrapper
that restores the correct setting of DYLD_LIBRARY_PATH. We could
perhaps make that work for the invocations of test postmasters
and psqls from "make" and TAP scripts, but hacking up our code's
sundry uses of system(3) like that seems like it'd be very messy,
if feasible at all.
BTW, the POSIX spec explicitly discourages letting SHELL affect the
behavior of system(3), so I bet that wouldn't help.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:04 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 00:36 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-15 02:46 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-15 03:20 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-15 03:20 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Thomas Munro <thomas.munro@gmail.com>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-14 22:46:07 -0400, Tom Lane wrote:
> Thomas Munro <thomas.munro@gmail.com> writes:
> > I suppose you could point SHELL at an unsigned copy of sh (codesign
> > --remove-signature, or something from brew/ports/x) so that GNU make
> > should respect, but I don't know how many other exec("/bin/sh") calls
> > might be hiding around the place (I guess perl calls system()?) and
> > might require some kind of LD_PRELOAD hackery... not much fun.
>
> Yeah. I thought about invoking everything via a small wrapper
> that restores the correct setting of DYLD_LIBRARY_PATH. We could
> perhaps make that work for the invocations of test postmasters
> and psqls from "make" and TAP scripts, but hacking up our code's
> sundry uses of system(3) like that seems like it'd be very messy,
> if feasible at all.
It does sound like using relative rpaths might be the thing we want - and like
they've been available since 10.5 or something.
Is there a reason we're using absolute rpaths on a bunch of platforms, rather
than relative ones, which'd allow relocation?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
@ 2021-10-14 23:15 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:23 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-14 23:15 UTC (permalink / raw)
To: Thomas Munro <thomas.munro@gmail.com>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-15 11:23:00 +1300, Thomas Munro wrote:
> On Fri, Oct 15, 2021 at 11:00 AM Tom Lane <tgl@sss.pgh.pa.us> wrote:
> > Peter E. did some hacking towards another solution awhile ago,
> > but IIRC it involved changing the built binaries, and I think
> > we concluded that the benefits didn't justify that.
>
> Yeah, by now there are lots of useful blogs from various projects
> figuring out that you can use the install_name_tool to adjust the
> paths it uses to be absolute or relative to certain magic words, like
> @executable_path/../lib/blah.dylib, which is tempting, but...
> realistically, for serious hacking on a Mac, SIP is so annoying that
> it isn't the only reason you'll want to turn it off: it stops
> dtrace/dtruss/... from working, and somehow prevents debuggers from
> working when you've ssh'd in from a remote machine with a proper
> keyboard, and probably more things that I'm forgetting.
Meson has support for using install_name_tool to remove "build time" rpaths
and set "install time" rpaths during the installation process - which uses
install_name_tool on mac.
If, and perhaps that's too big an if, relative rpaths actually work despite
SIP, it might be worth setting a relative install_rpath, because afaict that
should then work both for a "real" installation and our temporary test one.
If absolute rpaths are required, it'd make the process a bit more expensive,
because we'd probably need to change a configure time option during the temporary
install. No actual rebuilds would be required, but still.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 23:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 23:23 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 18:50 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-14 23:23 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Thomas Munro <thomas.munro@gmail.com>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> If, and perhaps that's too big an if, relative rpaths actually work despite
> SIP, it might be worth setting a relative install_rpath, because afaict that
> should then work both for a "real" installation and our temporary test one.
From what we know so far, it seems like SIP wouldn't interfere with
that (if it works at all). I think what SIP desires to prevent is
messing with a program's execution by setting DYLD_LIBRARY_PATH.
As long as the program executable itself is saying where to find
the library, I don't see why they should interfere with that.
(Again, it seems blindingly stupid to forbid this while not blocking
PATH or any of the other environment variables that have always affected
execution. But what do I know.)
> If absolute rpaths are required, it'd make the process a bit more expensive,
It'd also put the kibosh on relocatable install trees, though I dunno how
much people really care about that.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 23:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 23:23 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-15 18:50 ` Andres Freund <andres@anarazel.de>
2021-10-15 22:36 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-15 18:50 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; Peter Eisentraut <peter_e@gmx.net>; +Cc: Thomas Munro <thomas.munro@gmail.com>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-14 19:23:58 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > If, and perhaps that's too big an if, relative rpaths actually work despite
> > SIP, it might be worth setting a relative install_rpath, because afaict that
> > should then work both for a "real" installation and our temporary test one.
>
> From what we know so far, it seems like SIP wouldn't interfere with
> that (if it works at all). I think what SIP desires to prevent is
> messing with a program's execution by setting DYLD_LIBRARY_PATH.
> As long as the program executable itself is saying where to find
> the library, I don't see why they should interfere with that.
Well, there's *some* danger with relative rpaths, because they might
accidentally be pointing somewhere non-existing and user-creatable. Not a huge
risk, but as you say:
> (Again, it seems blindingly stupid to forbid this while not blocking
> PATH or any of the other environment variables that have always affected
> execution. But what do I know.)
these aren't necessarily carefuly weighed considerations :/
But it seems to work well from what I gather.
> > If absolute rpaths are required, it'd make the process a bit more expensive,
>
> It'd also put the kibosh on relocatable install trees, though I dunno how
> much people really care about that.
We currently use absolute rpaths, or something equivalent.
The reason that running tests on macos works is that we set the "install_name"
of shared libraries to the intended installed location, using an absolute
path:
LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
which on macos means that all libraries linking to that dylib reference it
under that absolute path.
On most other platforms we set an absolute rpath to the installation
directory, which has an equivalent effect:
rpathdir = $(libdir)
It seems to work quite well to change our own references to libpq in binaries
/ shared libs to be relative, but to leave the install_name of the libraries
intact. In combination with adding an rpath of @loader_path/../lib/ to
binaries and @loader_path/ to shlibs, the install will re relocatable.
It doesn't work as well to actually have a non-absolute install_name for
libraries (e.g. @rpath/libpq.dylib), because then external code linking to
libpq needs to add an rpath to the installation to make it work.
The advantage of this approach over Peter's is that it's not temp-install
specific - due to the relative paths, it makes installations relocatable
without relying [DY]LD_LIBRARY_PATH.
On other unixoid systems this whole mess is simpler, because we can just add
$ORIGIN to shared libraries and $ORIGIN/../lib/ to binaries. We don't need to
leave some absolute path in the libraries themself intact.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 23:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 23:23 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 18:50 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-15 22:36 ` Andres Freund <andres@anarazel.de>
2021-10-15 22:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-15 22:36 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; Peter Eisentraut <peter_e@gmx.net>; +Cc: Thomas Munro <thomas.munro@gmail.com>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-15 11:50:30 -0700, Andres Freund wrote:
> It seems to work quite well to change our own references to libpq in binaries
> / shared libs to be relative, but to leave the install_name of the libraries
> intact. In combination with adding an rpath of @loader_path/../lib/ to
> binaries and @loader_path/ to shlibs, the install will re relocatable.
>
> It doesn't work as well to actually have a non-absolute install_name for
> libraries (e.g. @rpath/libpq.dylib), because then external code linking to
> libpq needs to add an rpath to the installation to make it work.
>
> The advantage of this approach over Peter's is that it's not temp-install
> specific - due to the relative paths, it makes installations relocatable
> without relying [DY]LD_LIBRARY_PATH.
>
> On other unixoid systems this whole mess is simpler, because we can just add
> $ORIGIN to shared libraries and $ORIGIN/../lib/ to binaries. We don't need to
> leave some absolute path in the libraries themself intact.
I implemented this for the meson build, and it seems to work nicely. The macos
part was harder than I hoped due to the install_name stuff, which meson
doesn't solve.
https://github.com/anarazel/postgres/commit/a35379c28989469cc4b701a8d7a22422e6302e09
After that the build directory is relocatale.
I don't immediately see a way to do this reasonably for the autoconf
build. We'd need a list of our own shared libraries from somewhere, and then
replace the references after building the objects?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-10-14 23:15 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 23:23 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 18:50 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-15 22:36 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-15 22:47 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-15 22:47 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; Peter Eisentraut <peter_e@gmx.net>; +Cc: Thomas Munro <thomas.munro@gmail.com>; John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-15 15:36:16 -0700, Andres Freund wrote:
> On 2021-10-15 11:50:30 -0700, Andres Freund wrote:
> > It seems to work quite well to change our own references to libpq in binaries
> > / shared libs to be relative, but to leave the install_name of the libraries
> > intact. In combination with adding an rpath of @loader_path/../lib/ to
> > binaries and @loader_path/ to shlibs, the install will re relocatable.
> >
> > It doesn't work as well to actually have a non-absolute install_name for
> > libraries (e.g. @rpath/libpq.dylib), because then external code linking to
> > libpq needs to add an rpath to the installation to make it work.
> >
> > The advantage of this approach over Peter's is that it's not temp-install
> > specific - due to the relative paths, it makes installations relocatable
> > without relying [DY]LD_LIBRARY_PATH.
> >
> > On other unixoid systems this whole mess is simpler, because we can just add
> > $ORIGIN to shared libraries and $ORIGIN/../lib/ to binaries. We don't need to
> > leave some absolute path in the libraries themself intact.
>
> I implemented this for the meson build, and it seems to work nicely. The macos
> part was harder than I hoped due to the install_name stuff, which meson
> doesn't solve.
>
> https://github.com/anarazel/postgres/commit/a35379c28989469cc4b701a8d7a22422e6302e09
>
> After that the build directory is relocatale.
Well, now that I think about it, it's still only relocatable in the sense that
postgres itself will continue to work. Outside code linking to e.g. libpq will
get the wrong path after relocation the source tree, due to the absolute
install_name.
But that doesn't seem solvable, unless we make the installed install_name to
be '@rpath/libpq...dylib' and require code linking to libpq to pass
-Wl,-rpath,/path/to/libpq when linking to libpq.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-14 22:55 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:27 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-14 22:55 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: John Naylor <john.naylor@enterprisedb.com>; pgsql-hackers
Hi,
On 2021-10-14 18:00:49 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > Is this a Mac with SIP enabled? The Mac CI presumably has that disabled, which is why I didn't see this issue there. Probably need to implement whatever Tom figured out to do about that for the current way of running tests.
>
> AFAIR the only cases we've made work are
>
> (1) disable SIP
>
> (2) avoid the need for (1) by always doing "make install" before
> "make check".
Ah, I thought it was more than that. In that case, John, does meson's test
succeed after you did the "proper" install? Assuming it's in a path that's
allowed to provide shared libraries?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:55 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-14 23:27 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-15 00:02 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-14 23:27 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
On Thu, Oct 14, 2021 at 6:55 PM Andres Freund <andres@anarazel.de> wrote:
> Ah, I thought it was more than that. In that case, John, does meson's test
> succeed after you did the "proper" install? Assuming it's in a path that's
> allowed to provide shared libraries?
Oh, it can act like installcheck? [checks] Yep, "meson test" ran fine (*).
It still ran the temp install first, but in any case it worked. The full
"configure step" was
meson setup build --buildtype debug -Dldap=disabled -Dcassert=true
-Dprefix=$(pwd)/inst
* (all passed but skipped subscription/t/012_collation.pl)
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 22:00 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:55 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-14 23:27 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-15 00:02 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-15 00:02 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
Hi,
On 2021-10-14 19:27:17 -0400, John Naylor wrote:
> On Thu, Oct 14, 2021 at 6:55 PM Andres Freund <andres@anarazel.de> wrote:
> > Ah, I thought it was more than that. In that case, John, does meson's test
> > succeed after you did the "proper" install? Assuming it's in a path that's
> > allowed to provide shared libraries?
>
> Oh, it can act like installcheck? [checks] Yep, "meson test" ran fine (*).
> It still ran the temp install first, but in any case it worked.
As far as I understand Tom, our normal make check only works on OSX if
previously you ran make install. Which will have installed libpq into the
"proper" install location. Because all our binaries will, by default, have an
rpath to the library directory embedded, that then allows binaries in the
temporary install to work. But using the wrong libpq - which most of the time
turns out to be harmless, because libpq doesn't change that rapidly.
> * (all passed but skipped subscription/t/012_collation.pl)
That test requires ICU, so that's fine. I guess we could prevent the test from
being executed in the first place, but I don't think we've done that for cases
where it's one specific test in a t/ directory, where others in the same
directory do not have such dependencies.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-14 04:27 ` Thomas Munro <thomas.munro@gmail.com>
1 sibling, 0 replies; 143+ messages in thread
From: Thomas Munro @ 2021-10-14 04:27 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
On Thu, Oct 14, 2021 at 4:51 AM John Naylor
<john.naylor@enterprisedb.com> wrote:
> /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers/ldap.h:1:10: error: #include nested too deeply
> #include <ldap.h>
> ^
I vaguely recall that PostgreSQL should build OK against Apple's copy
of OpenLDAP. That recursive include loop is coming from a "framework"
header that contains just a couple of lines like #include <ldap.h> to
try to include the real header, which should also be in the include
path, somewhere like
/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/usr/include/ldap.h.
I think we'd need to figure out where that
-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers
directive is coming from and get rid of it, so we can include the real
header directly.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-21 21:48 ` Andres Freund <andres@anarazel.de>
2021-10-22 15:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-21 21:48 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-12 15:55:22 -0400, John Naylor wrote:
> Also, could utility makefile targets be made to work? I'm thinking in
> particular of update-unicode and reformat-dat-files, for example.
Implementing reformat-dat-files was trivial:
https://github.com/anarazel/postgres/commit/29c1ce1ad4731290714978da5ce81e99ef051bec
However, update-unicode is a bit harder. Partially not directly because of
meson, but because update-unicode as-is afaict doesn't support VPATH builds,
and meson enforces those.
make update-unicode
...
make -C src/common/unicode update-unicode
'/usr/bin/perl' generate-unicode_norm_table.pl
Can't open perl script "generate-unicode_norm_table.pl": No such file or directory
It's not too hard to fix. See attached for the minimal stuff that I
immediately found to be needed. There's likely more,
e.g. src/backend/utils/mb/Unicode - but I didn't immediately see where that's
invoked from.
The slightly bigger issue making update-unicode work with meson is that meson
doesn't provide support for invoking build targets in specific directories
(because it doesn't map nicely to e.g. msbuild). But scripts like
src/common/unicode/generate-unicode_norm_table.pl rely on CWD. It's not hard
to work around that, but IMO it's better for such scripts to not rely on CWD.
Greetings,
Andres Freund
Attachments:
update-unicode.diff (text/x-diff, 2.2K) download
diff --git i/src/common/unicode/Makefile w/src/common/unicode/Makefile
index a3683dd86b9..e69054d4671 100644
--- i/src/common/unicode/Makefile
+++ w/src/common/unicode/Makefile
@@ -12,14 +12,14 @@ subdir = src/common/unicode
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(abs_top_builddir)/src/common/unicode $(CPPFLAGS)
LIBS += $(PTHREAD_LIBS)
# By default, do nothing.
all:
update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_east_asian_fw_table.h unicode_normprops_table.h unicode_norm_hashfunc.h
- mv $^ ../../../src/include/common/
+ mv $^ $(top_srcdir)/src/include/common/
$(MAKE) normalization-check
# These files are part of the Unicode Character Database. Download
@@ -33,7 +33,7 @@ UnicodeData.txt EastAsianWidth.txt DerivedNormalizationProps.txt CompositionExcl
unicode_norm_hashfunc.h: unicode_norm_table.h
unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt
- $(PERL) generate-unicode_norm_table.pl
+ $(PERL) $^
unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt
$(PERL) $^ >$@
@@ -58,7 +58,7 @@ submake-common:
$(MAKE) -C .. all
norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt
- perl generate-norm_test_table.pl NormalizationTest.txt $@
+ perl $^ $@
.PHONY: normalization-check
diff --git i/contrib/unaccent/Makefile w/contrib/unaccent/Makefile
index b8307d1601e..d6c466e07ad 100644
--- i/contrib/unaccent/Makefile
+++ w/contrib/unaccent/Makefile
@@ -27,12 +27,12 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
-update-unicode: unaccent.rules
+update-unicode: $(srcdir)/unaccent.rules
# Allow running this even without --with-python
PYTHON ?= python
-unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml
+$(srcdir)/unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml
$(PYTHON) $< --unicode-data-file $(word 2,$^) --latin-ascii-file $(word 3,$^) >$@
# Only download it once; dependencies must match src/common/unicode/
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-21 21:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-22 15:55 ` John Naylor <john.naylor@enterprisedb.com>
2022-03-09 18:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-22 15:55 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
On Thu, Oct 21, 2021 at 5:48 PM Andres Freund <andres@anarazel.de> wrote:
> However, update-unicode is a bit harder. Partially not directly because
of
> meson, but because update-unicode as-is afaict doesn't support VPATH
builds,
> and meson enforces those.
> make update-unicode
> ...
> make -C src/common/unicode update-unicode
> '/usr/bin/perl' generate-unicode_norm_table.pl
> Can't open perl script "generate-unicode_norm_table.pl": No such file or
directory
>
> It's not too hard to fix. See attached for the minimal stuff that I
> immediately found to be needed.
Thanks for doing that, it works well enough for demonstration. With your
patch, and using an autoconf VPATH build, the unicode tables work fine, but
it complains of a permission error in generate_unaccent_rules.py. That
seems to be because the script is invoked directly rather than as an
argument to the python interpreter.
> The slightly bigger issue making update-unicode work with meson is that
meson
> doesn't provide support for invoking build targets in specific directories
> (because it doesn't map nicely to e.g. msbuild). But scripts like
> src/common/unicode/generate-unicode_norm_table.pl rely on CWD. It's not
hard
> to work around that, but IMO it's better for such scripts to not rely on
CWD.
Yeah. I encountered a further issue: With autoconf on HEAD, with a source
tree build executed in contrib/unaccent:
$ touch generate_unaccent_rules.py
$ make update-unicode
generate_unaccent_rules.py --unicode-data-file
../../src/common/unicode/UnicodeData.txt --latin-ascii-file Latin-ASCII.xml
>unaccent.rules
/bin/sh: generate_unaccent_rules.py: command not found
make: *** [unaccent.rules] Error 127
make: *** Deleting file `unaccent.rules'
...so in this case it seems not to know to use CWD here.
Anyway, this can be put off until the very end, since it's not run often.
You've demonstrated how these targets would work, and that's good enough
for now.
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 19:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-21 21:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-22 15:55 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2022-03-09 18:47 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-03-09 18:47 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: pgsql-hackers
Hi,
On 2021-10-22 11:55:05 -0400, John Naylor wrote:
> On Thu, Oct 21, 2021 at 5:48 PM Andres Freund <andres@anarazel.de> wrote:
>
> > However, update-unicode is a bit harder. Partially not directly because
> of
> > meson, but because update-unicode as-is afaict doesn't support VPATH
> builds,
> > and meson enforces those.
>
> > make update-unicode
> > ...
> > make -C src/common/unicode update-unicode
> > '/usr/bin/perl' generate-unicode_norm_table.pl
> > Can't open perl script "generate-unicode_norm_table.pl": No such file or
> directory
> >
> > It's not too hard to fix. See attached for the minimal stuff that I
> > immediately found to be needed.
>
> Thanks for doing that, it works well enough for demonstration. With your
> patch, and using an autoconf VPATH build, the unicode tables work fine, but
> it complains of a permission error in generate_unaccent_rules.py. That
> seems to be because the script is invoked directly rather than as an
> argument to the python interpreter.
>
> Yeah. I encountered a further issue: With autoconf on HEAD, with a source
> tree build executed in contrib/unaccent:
This seems to be the same issue as above?
> $ touch generate_unaccent_rules.py
> $ make update-unicode
> generate_unaccent_rules.py --unicode-data-file
> ../../src/common/unicode/UnicodeData.txt --latin-ascii-file Latin-ASCII.xml
> >unaccent.rules
> /bin/sh: generate_unaccent_rules.py: command not found
> make: *** [unaccent.rules] Error 127
> make: *** Deleting file `unaccent.rules'
This looks more like you're building without --with-python and you don't have
a 'python' binary (but a python3 binary)?
Independent of my changes the invocation of generate_unaccent_rules looks like
# Allow running this even without --with-python
PYTHON ?= python
...
$(PYTHON) $< --unicode-data-file $(word 2,$^) --latin-ascii-file $(word 3,$^) >$@
so your failure should only happen if PYTHON somehow is empty, otherwise I'd
expect python in front of the failing line?
> Anyway, this can be put off until the very end, since it's not run often.
> You've demonstrated how these targets would work, and that's good enough
> for now.
I'd like to get this stuff out of the patch series, so I'm planning to get
this committable...
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-19 18:34 ` Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
11 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-19 18:34 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi Tom,
On 2021-10-12 01:37:21 -0700, Andres Freund wrote:
> As far as I can tell the only OS that postgres currently supports that
> meson doesn't support is HPUX. It'd likely be fairly easy to add
> gcc-on-hpux support, a chunk more to add support for the proprietary
> ones.
Tom, wrt HPUX on pa-risc, what are your thoughts there? IIRC we gave up
supporting HP's compiler on pa-risc a while ago.
As I said it'd probably not be too hard to add meson support for hpux on hppa,
it's probably just a few branches. But that'd require access somewhere. The
gcc compile farm does not have a hppa member anymore...
I did notice that gcc will declare hppa-hpux obsolete in gcc 12 and will
remove at some point:
"The hppa[12]*-*-hpux10* and hppa[12]*-*-hpux11* configurations targeting 32-bit PA-RISC with HP-UX have been obsoleted and will be removed in a future release."
https://gcc.gnu.org/gcc-12/changes.html
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-19 19:22 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-19 21:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-19 19:22 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2021-10-12 01:37:21 -0700, Andres Freund wrote:
>> As far as I can tell the only OS that postgres currently supports that
>> meson doesn't support is HPUX. It'd likely be fairly easy to add
>> gcc-on-hpux support, a chunk more to add support for the proprietary
>> ones.
> Tom, wrt HPUX on pa-risc, what are your thoughts there? IIRC we gave up
> supporting HP's compiler on pa-risc a while ago.
Right. I am still testing with gcc on HP-PA. I'd kind of like to
keep it running just as an edge case for our spinlock support, but
I'm not sure that I want to do any huge amount of work on meson
to keep that going.
I do have a functioning OpenBSD installation on that machine, so
one alternative if the porting costs look too high is to replace
gaur with an OpenBSD animal. However, last I checked, OpenBSD
was about half the speed of HPUX on that hardware, so I'm not
real eager to go that way. gaur's already about the slowest
animal in the farm :-(
> As I said it'd probably not be too hard to add meson support for hpux on hppa,
> it's probably just a few branches. But that'd require access somewhere. The
> gcc compile farm does not have a hppa member anymore...
If you've got an idea where to look, I could add that to my
to-do queue.
In any case, I don't think we need to consider HPUX as a blocker
for the meson approach. The value-add from keeping gaur going
probably isn't terribly much. I'm more concerned about the
effort involved in getting meson going on some other old animals,
such as prairiedog.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-19 21:57 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-20 00:31 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: John Naylor @ 2021-10-19 21:57 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; Thomas Munro <thomas.munro@gmail.com>; +Cc: pgsql-hackers
Hi,
I know this is still in the evaluation stage, but I did notice some
discrepencies in the Flex flags. With the attached patch, the read-only
data segment seems to match up pretty well now.
--
John Naylor
EDB: http://www.enterprisedb.com
Attachments:
sync-flex-flags-with-autoconf-build.patch (application/octet-stream, 5.1K) download
diff --git a/contrib/cube/meson.build b/contrib/cube/meson.build
index 49276aed64..3cf7ebdd8e 100644
--- a/contrib/cube/meson.build
+++ b/contrib/cube/meson.build
@@ -6,7 +6,7 @@ cube_sources = files(
cubescan = custom_target('cubescan',
input: ['cubescan.l'],
output: ['cubescan.c'],
- command: [flex, '-CFe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+ command: [flex, '-o', '@OUTPUT@', '@INPUT@'])
cube_sources += custom_target('cubeparse',
input: 'cubeparse.y',
diff --git a/src/backend/parser/meson.build b/src/backend/parser/meson.build
index 491eacf20b..5ce4d09f31 100644
--- a/src/backend/parser/meson.build
+++ b/src/backend/parser/meson.build
@@ -28,7 +28,7 @@ parser_sources = [files('parser.c')]
backend_scanner = custom_target('scan',
input: ['scan.l'],
output: ['scan.c'],
- command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT0@'])
+ command: [flex, '-b', '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT0@'])
parser_sources += backend_scanner[0]
parser_sources += backend_parser_header[0]
diff --git a/src/backend/replication/meson.build b/src/backend/replication/meson.build
index 2573f166d7..ee12c6d49d 100644
--- a/src/backend/replication/meson.build
+++ b/src/backend/replication/meson.build
@@ -17,7 +17,7 @@ backend_sources += files(
repl_scanner = custom_target('repl_scanner',
input : files('repl_scanner.l'),
output : ['repl_scanner.c'],
- command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+ command: [flex, '-o', '@OUTPUT@', '@INPUT@']
)
generated_backend_sources += custom_target('repl_gram',
@@ -30,7 +30,7 @@ generated_backend_sources += custom_target('repl_gram',
syncrep_scanner = custom_target('syncrep_scanner',
input: 'syncrep_scanner.l',
output: 'syncrep_scanner.c',
- command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@'])
+ command: [flex, '-o', '@OUTPUT@', '@INPUT@'])
generated_backend_sources += custom_target('syncrep_gram',
input: 'syncrep_gram.y',
diff --git a/src/backend/utils/adt/meson.build b/src/backend/utils/adt/meson.build
index 086fde8ff0..e1cea1eb4e 100644
--- a/src/backend/utils/adt/meson.build
+++ b/src/backend/utils/adt/meson.build
@@ -109,7 +109,7 @@ backend_sources += files(
jsonpath_scan = custom_target('jsonpath_scan',
input: ['jsonpath_scan.l'],
output: ['jsonpath_scan.c'],
- command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+ command: [flex, '-b', '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
# jsonpath_scan is compiled as part of jsonpath_gram
generated_backend_sources += custom_target('jsonpath_parse',
diff --git a/src/backend/utils/misc/meson.build b/src/backend/utils/misc/meson.build
index 5274c8aa1a..2c0090ad33 100644
--- a/src/backend/utils/misc/meson.build
+++ b/src/backend/utils/misc/meson.build
@@ -18,7 +18,7 @@ backend_sources += files(
guc_scan = custom_target('guc_scan',
input: ['guc-file.l'],
output: ['guc-file.c.h'],
- command: [flex, '-CF', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+ command: [flex, '-o', '@OUTPUT@', '@INPUT@'])
generated_backend_sources += guc_scan
diff --git a/src/bin/pgbench/meson.build b/src/bin/pgbench/meson.build
index 5c4a778ff3..bc135abebf 100644
--- a/src/bin/pgbench/meson.build
+++ b/src/bin/pgbench/meson.build
@@ -9,7 +9,7 @@ pgbench_sources = files(
exprscan = custom_target('exprscan',
input : files('exprscan.l'),
output : ['exprscan.c'],
- command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+ command : [flex, '-o', '@OUTPUT0@', '@INPUT@']
)
exprparse = custom_target('exprparse',
diff --git a/src/bin/psql/meson.build b/src/bin/psql/meson.build
index 98921f801d..e56beb28e1 100644
--- a/src/bin/psql/meson.build
+++ b/src/bin/psql/meson.build
@@ -18,7 +18,7 @@ psql_sources = files(
psql_sources += custom_target('psqlscanslash',
input: ['psqlscanslash.l'],
output: ['psqlscanslash.c'],
- command: [flex, '-CFe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+ command: [flex, '-b', '-Cfe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
psql_sources += custom_target('psql_help',
input: ['create_help.pl'],
diff --git a/src/fe_utils/meson.build b/src/fe_utils/meson.build
index b305727d96..e3f0b34cf1 100644
--- a/src/fe_utils/meson.build
+++ b/src/fe_utils/meson.build
@@ -16,7 +16,7 @@ fe_utils_sources = files(
fe_utils_sources += custom_target('psqlscan',
input: ['psqlscan.l'],
output: ['psqlscan.c'],
- command: [flex, '-Cfe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
+ command: [flex, '-b', '-Cfe', '-p', '-p', '-o', '@OUTPUT@', '@INPUT@'])
fe_utils = static_library('fe_utils',
fe_utils_sources + generated_headers,
diff --git a/src/test/isolation/meson.build b/src/test/isolation/meson.build
index 637b480755..ea8baa2063 100644
--- a/src/test/isolation/meson.build
+++ b/src/test/isolation/meson.build
@@ -8,7 +8,7 @@ isolation_sources = pg_regress_c + files(
spec_scanner = custom_target('specscanner',
input : files('specscanner.l'),
output : ['specscanner.c'],
- command : [flex, '-CF', '-p', '-p', '-o', '@OUTPUT0@', '@INPUT@']
+ command : [flex, '-o', '@OUTPUT0@', '@INPUT@']
)
isolationtester_sources = files('isolationtester.c')
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-19 21:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2021-10-20 00:31 ` Andres Freund <andres@anarazel.de>
2021-10-20 01:10 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:35 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-20 00:31 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Thomas Munro <thomas.munro@gmail.com>; pgsql-hackers
Hi,
On 2021-10-19 17:57:31 -0400, John Naylor wrote:
> I know this is still in the evaluation stage, but I did notice some
> discrepencies in the Flex flags. With the attached patch, the read-only
> data segment seems to match up pretty well now.
Good catch. I think I just copied them around...
I wish we had a bit more consistency in the flags, so we could centralize
them. Seems there's no reason to not use -p -p and -b everywhere?
I also need to make meson use our flex wrapper for the relevant versions... I
can see the warning that'd be fixed by it on macos CI. Will do that and push
it out to my github repo together with your changes.
Thanks!
Andres
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-19 21:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-20 00:31 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 01:10 ` Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 0 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-20 01:10 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: John Naylor <john.naylor@enterprisedb.com>; Thomas Munro <thomas.munro@gmail.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> I wish we had a bit more consistency in the flags, so we could centralize
> them. Seems there's no reason to not use -p -p and -b everywhere?
I don't think we care enough about performance of most of the scanners
to make them all backup-free, so -1 to that idea.
We could possibly replace the command line switches with %option
entries in the files themselves. But I think the reason we haven't
done so for -b is that the Makefile still needs to know about it
so as to know what to do with the lex.backup output file.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-19 21:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2021-10-20 00:31 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 01:35 ` Andres Freund <andres@anarazel.de>
1 sibling, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-20 01:35 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Thomas Munro <thomas.munro@gmail.com>; pgsql-hackers
Hi,
On 2021-10-19 17:31:22 -0700, Andres Freund wrote:
> I also need to make meson use our flex wrapper for the relevant versions... I
> can see the warning that'd be fixed by it on macos CI. Will do that and push
> it out to my github repo together with your changes.
That turned out to be more work than I anticipated, so I pushed your changes
out separately.
There's this bit in plflex.pl that talks about adjusting yywrap() for msvc. I
didn't implement that and didn't see any compilation problems. Looks like that
originally hails from 2011, in 08a0c2dabc3b9d59d72d7a79ed867b8e37d275a7
Hm. Seems not worth carrying forward unless it actually causes trouble?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-20 01:08 ` Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-20 01:08 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2021-10-19 15:22:15 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > On 2021-10-12 01:37:21 -0700, Andres Freund wrote:
> >> As far as I can tell the only OS that postgres currently supports that
> >> meson doesn't support is HPUX. It'd likely be fairly easy to add
> >> gcc-on-hpux support, a chunk more to add support for the proprietary
> >> ones.
>
> > Tom, wrt HPUX on pa-risc, what are your thoughts there? IIRC we gave up
> > supporting HP's compiler on pa-risc a while ago.
>
> Right. I am still testing with gcc on HP-PA. I'd kind of like to
> keep it running just as an edge case for our spinlock support, but
> I'm not sure that I want to do any huge amount of work on meson
> to keep that going.
Makes sense. While that does test an odd special case for our spinlock
implementation, it's also the only supported platform with that edge case, and
it seems extremely unlikely that there ever will be a new platform with such
odd/limited atomic operations.
> I do have a functioning OpenBSD installation on that machine, so
> one alternative if the porting costs look too high is to replace
> gaur with an OpenBSD animal. However, last I checked, OpenBSD
> was about half the speed of HPUX on that hardware, so I'm not
> real eager to go that way. gaur's already about the slowest
> animal in the farm :-(
Yea, that doesn't sound enticing. Seems like we either should keep it running
on hp-ux or just drop parisc support?
> > As I said it'd probably not be too hard to add meson support for hpux on hppa,
> > it's probably just a few branches. But that'd require access somewhere. The
> > gcc compile farm does not have a hppa member anymore...
>
> If you've got an idea where to look, I could add that to my to-do queue.
It might even just work. Looks like meson does have pa-risc detection. While
it doesn't have any specifically for hpux, it just falls back to python's
sys.platform in that case. python3 -c 'import sys;print(sys.platform)'
meson generates output for ninja to execute (basically a faster make that's
partially faster by being much less flexible. Intended to be output by more
user-friendly buildsystems ). Ninja can be built by a minimal python script,
or with cmake. The former doesn't seem to have hpux support, the latter does I
think.
https://github.com/ninja-build/ninja
So it could be interesting to see if ninja builds.
I've not taught the PG meson the necessary stuff for a 32 bit build. So
there's no point is trying whether meson works that much. I'll try to do that,
and let you know.
> I'm more concerned about the effort involved in getting meson going on some
> other old animals, such as prairiedog.
Yea, that's an *old* OS version. One version too old to have support for
@rpath, added in 10.5 :(. Is there a reason to run 10.4 specifically?
According to wikipedia 10.5 is the last version to support ppc.
Looks like python still supports building back to 10.4.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 01:26 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:49 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-10-20 01:26 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2021-10-19 15:22:15 -0400, Tom Lane wrote:
>> I'm more concerned about the effort involved in getting meson going on some
>> other old animals, such as prairiedog.
> Yea, that's an *old* OS version. One version too old to have support for
> @rpath, added in 10.5 :(. Is there a reason to run 10.4 specifically?
> According to wikipedia 10.5 is the last version to support ppc.
My notes say
Currently running OSX 10.4.11 (last release of Tiger); although 10.5 Leopard
supports PPCs, it refuses to install if CPU speed < 867MHz, well beyond the
Cube's ability. Wikipedia does suggest it's possible to run Leopard, but...
https://en.wikipedia.org/wiki/Mac_OS_X_Leopard#Usage_on_unsupported_hardware
I'm not sure that I have install media for 10.5 anymore, either --- ISTR
some machine's CD drive failing and not letting me get the CD back out.
If I did have it, I don't think there'd be a way to update past 10.5.0
(surely Apple no longer has those updaters on-line?), so on the whole
I think that path is a nonstarter.
I do have 10.5 running on an old G4 PowerMac, but that machine is (a)
noisy (b) power-hungry and (c) getting flaky, so I'm uneager to spin up
a buildfarm animal on it.
As with the HPPA, a potential compromise is to spin up some newer
BSD-ish system on it. I agree that OSX 10.4 is uninteresting as a
software platform, but I'd like to keep 32-bit PPC represented in
the farm.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-10-20 01:49 ` Andres Freund <andres@anarazel.de>
2021-10-20 02:04 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-20 01:49 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2021-10-19 21:26:53 -0400, Tom Lane wrote:
> My notes say
>
> Currently running OSX 10.4.11 (last release of Tiger); although 10.5 Leopard
> supports PPCs, it refuses to install if CPU speed < 867MHz, well beyond the
> Cube's ability. Wikipedia does suggest it's possible to run Leopard, but...
> https://en.wikipedia.org/wiki/Mac_OS_X_Leopard#Usage_on_unsupported_hardware
>
> I'm not sure that I have install media for 10.5 anymore, either --- ISTR
> some machine's CD drive failing and not letting me get the CD back out.
> If I did have it, I don't think there'd be a way to update past 10.5.0
> (surely Apple no longer has those updaters on-line?), so on the whole
> I think that path is a nonstarter.
That does indeed sound like a nonstarter.
> I do have 10.5 running on an old G4 PowerMac, but that machine is (a)
> noisy (b) power-hungry and (c) getting flaky, so I'm uneager to spin up
> a buildfarm animal on it.
Understandable.
> As with the HPPA, a potential compromise is to spin up some newer
> BSD-ish system on it. I agree that OSX 10.4 is uninteresting as a
> software platform, but I'd like to keep 32-bit PPC represented in
> the farm.
I assume the reason 32-bit PPC is interesting is that it's commonly run big
endian?
I wonder when it'll be faster to run 32bit ppc via qemu than natively :)
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:49 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 02:04 ` Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 0 replies; 143+ messages in thread
From: Tom Lane @ 2021-10-20 02:04 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2021-10-19 21:26:53 -0400, Tom Lane wrote:
>> As with the HPPA, a potential compromise is to spin up some newer
>> BSD-ish system on it. I agree that OSX 10.4 is uninteresting as a
>> software platform, but I'd like to keep 32-bit PPC represented in
>> the farm.
> I assume the reason 32-bit PPC is interesting is that it's commonly run big
> endian?
Aside from bit width and endianness, I believe it's a somewhat smaller
instruction set than the newer CPUs.
> I wonder when it'll be faster to run 32bit ppc via qemu than natively :)
I think qemu would have a ways to go for that. More to the point,
I've found that its emulation is not as precise as one might wish...
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:49 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 02:41 ` Andres Freund <andres@anarazel.de>
2021-10-20 16:01 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-10-20 02:41 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2021-10-19 18:49:43 -0700, Andres Freund wrote:
> I wonder when it'll be faster to run 32bit ppc via qemu than natively :)
Freebsd didn't seem to want to boot, but surprisingly a debian buster image
started at least the installer without problems... Will probably take a while
to see if it actually works.
I assume to make it acceptable from a build-speed perspective one would have
to use distcc with the compiler running outside.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:08 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:49 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-20 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-10-20 16:01 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-10-20 16:01 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2021-10-19 19:41:56 -0700, Andres Freund wrote:
> On 2021-10-19 18:49:43 -0700, Andres Freund wrote:
> > I wonder when it'll be faster to run 32bit ppc via qemu than natively :)
>
> Freebsd didn't seem to want to boot, but surprisingly a debian buster image
> started at least the installer without problems... Will probably take a while
> to see if it actually works.
The build was quite slow (cold ccache cache, only 1 cpu):
real 106m33.418s
user 86m36.363s
sys 17m33.830s
But the actual test time wasn't *too* bad, compared to the 32bit ppc animals
real 12m14.944s
user 0m51.622s
sys 0m44.743s
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-11-15 18:34 ` Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
11 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2021-11-15 18:34 UTC (permalink / raw)
To: pgsql-hackers@postgresql.org, Tom Lane <tgl@sss.pgh.pa.us>
Hi,
FWIW, I tried building postgres on a few other operating systems using
meson, after I got access to the gcc compile farm. Here's the results:
- openbsd: Compiled fine. Hit one issue running tests:
openbsd has *completely* broken $ORIGIN support. It uses CWD as $ORIGIN
rpaths, which obviously breaks for binaries invoked via PATH. So there
goes the idea to only use $ORIGIN to run tests. Still seems worth to use
on other platforms, particularly because it works with SIP on macos
I understand not supporting $ORIGIN at all. But implementing it this way
seems insane.
I also ran into some problems with the semaphore limits. I had to switch to
USE_NAMED_POSIX_SEMAPHORES to make the tests pass at all.
- netbsd: Compiled fine after some minor fix. There's a bit more to fix around
many libraries not being in the normal library directory, but in
/usr/pkg/lib, which is not in the library search path (i.e. we need to add
an rpath for that in a few more places).
- AIX: Compiled and basic postgres runs fine after a few fixes (big endian
test, converting exports.txt into the right format). Doesn't yet
successfully run more than trivial tests, because I didn't implement the
necessary generation of import files for postgres, but that's just a bit of
work.
This is hampered by the fact that the vanilla postgres crashes for me. I
haven't quite figured out what's the problem. Might be a system issue -
lots of other tools, e.g. perl, segfault frequently.
One important thing to call out: Meson has support for the AIX linker, but
*not* the xlc compiler. I.e. one has to use gcc (or clang, but I didn't
try). I don't know if we'd require adding support for xlc to meson - xlc is
pretty buggy and it doesn't seem particularly crucial to support such an old
crufty compiler on a platform that's not used to a significant degree?
Greetings,
Andres
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-11-15 19:11 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-11-15 19:11 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> One important thing to call out: Meson has support for the AIX linker, but
> *not* the xlc compiler. I.e. one has to use gcc (or clang, but I didn't
> try). I don't know if we'd require adding support for xlc to meson - xlc is
> pretty buggy and it doesn't seem particularly crucial to support such an old
> crufty compiler on a platform that's not used to a significant degree?
While I have no particular interest in AIX or xlc specifically, I do
worry about us becoming a builds-on-gcc-or-workalikes-only project.
I suppose MSVC provides a little bit of a cross-check, but I don't
really like giving up on other compilers. Discounting gcc+clang+MSVC
leaves just a few buildfarm animals, and the xlc ones are a significant
part of that population. (In fact, unless somebody renews fossa/husky's
icc license, the three xlc animals will be an outright majority of
them, because wrasse and anole are the only other active animals with
non-mainstream compilers.)
Having said that, I don't plan to be the one trying to get meson
to add xlc support ...
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-11-15 19:23 ` Andres Freund <andres@anarazel.de>
2021-11-15 19:48 ` Re: [RFC] building postgres with meson Robert Haas <robertmhaas@gmail.com>
2021-11-15 22:08 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-11-18 20:44 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
0 siblings, 3 replies; 143+ messages in thread
From: Andres Freund @ 2021-11-15 19:23 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2021-11-15 14:11:25 -0500, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > One important thing to call out: Meson has support for the AIX linker, but
> > *not* the xlc compiler. I.e. one has to use gcc (or clang, but I didn't
> > try). I don't know if we'd require adding support for xlc to meson - xlc is
> > pretty buggy and it doesn't seem particularly crucial to support such an old
> > crufty compiler on a platform that's not used to a significant degree?
>
> While I have no particular interest in AIX or xlc specifically, I do
> worry about us becoming a builds-on-gcc-or-workalikes-only project.
> I suppose MSVC provides a little bit of a cross-check, but I don't
> really like giving up on other compilers. Discounting gcc+clang+MSVC
> leaves just a few buildfarm animals, and the xlc ones are a significant
> part of that population.
Yea, that's a reasonable concern. I wonder if there's some non-mainstream
compiler that actually works on, um, more easily available platforms that we
could utilize.
> (In fact, unless somebody renews fossa/husky's
> icc license, the three xlc animals will be an outright majority of
> them, because wrasse and anole are the only other active animals with
> non-mainstream compilers.)
It should probably be doable to get somebody to run another icc animal. Icc is
supported by meson, fwiw.
> Having said that, I don't plan to be the one trying to get meson
> to add xlc support ...
It'd probably not be too hard. But given that it's quite hard to get access to
AIX + xlc, I'm not sure it's something I want to propose. There's no resources
to run halfway regular tests on that I found...
It's good to make sure we're not growing too reliant on some compiler(s), but
imo only really makes sense if the alternative compilers are meaningfully
available and maintained.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-11-15 19:48 ` Robert Haas <robertmhaas@gmail.com>
2 siblings, 0 replies; 143+ messages in thread
From: Robert Haas @ 2021-11-15 19:48 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
On Mon, Nov 15, 2021 at 2:23 PM Andres Freund <andres@anarazel.de> wrote:
> It's good to make sure we're not growing too reliant on some compiler(s), but
> imo only really makes sense if the alternative compilers are meaningfully
> available and maintained.
That's a sensible position. I do worry that with this proposed move
we're going to be giving up some of the flexibility that we have right
now. I'm not sure exactly what that means in practice. But make is
just a way of running shell commands, and so you can run any shell
commands you want. The concept of some compiler not being supported
isn't really a thing that even makes sense in a world that is powered
by make. With a big enough hammer you can run any commands you like,
including any compilation commands you like. The whole thing is likely
to be a bit crufty which is a downside, and you might spend more time
fiddling with it than you really want. But nothing is really ever
blocked.
--
Robert Haas
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-11-15 22:08 ` Thomas Munro <thomas.munro@gmail.com>
2021-11-15 22:34 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 22:52 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2 siblings, 2 replies; 143+ messages in thread
From: Thomas Munro @ 2021-11-15 22:08 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
On Tue, Nov 16, 2021 at 8:23 AM Andres Freund <andres@anarazel.de> wrote:
> On 2021-11-15 14:11:25 -0500, Tom Lane wrote:
> > Having said that, I don't plan to be the one trying to get meson
> > to add xlc support ...
>
> It'd probably not be too hard. But given that it's quite hard to get access to
> AIX + xlc, I'm not sure it's something I want to propose. There's no resources
> to run halfway regular tests on that I found...
FWIW there's a free-as-in-beer edition of xlc for Linux (various
distros, POWER only) so you could use qemu, though of course there
will be differences WRT AIX especially around linking, and I suppose a
big part of that work would be precisely understanding stuff like
linker details.
It looks like we have two xlc 12.1 compilers in the farm, but those
compilers are EOL'd[1]. The current release is 16.1, and we have one
of those. The interesting thing about 16.1 is that you can invoke it
as xlclang to get the new clang frontend and, I think, possibly use
more clang/gcc-ish compiler switches[2].
[1] https://www.ibm.com/support/pages/lifecycle/search?q=xl%20c%2Fc%2B%2B
[2] https://www.ibm.com/docs/en/xl-c-and-cpp-aix/16.1?topic=new-clang-based-front-end
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 22:08 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
@ 2021-11-15 22:34 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 22:46 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Tom Lane @ 2021-11-15 22:34 UTC (permalink / raw)
To: Thomas Munro <thomas.munro@gmail.com>; +Cc: Andres Freund <andres@anarazel.de>; pgsql-hackers
Thomas Munro <thomas.munro@gmail.com> writes:
> ... The interesting thing about 16.1 is that you can invoke it
> as xlclang to get the new clang frontend and, I think, possibly use
> more clang/gcc-ish compiler switches[2].
> [2] https://www.ibm.com/docs/en/xl-c-and-cpp-aix/16.1?topic=new-clang-based-front-end
Ho, that's an earful ;-). Though I wonder whether that frontend
hides the AIX-specific linking issues you mentioned. (Also, although
I see /opt/IBM/xlc/16.1.0/ on gcc119, there's no xlclang there.
So whether we have useful access to it right now is unclear.)
This plays into something that was nagging at me while I wrote my
upthread screed about not giving up on non-gcc/clang compilers:
are those compilers outcompeting all the proprietary ones, to the
extent that the latter will be dead soon anyway? I think Microsoft
is rich enough and stubborn enough to keep on developing MSVC no
matter what, but other compiler vendors may see the handwriting
on the wall. Writing C compilers can't be a growth industry these
days.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 22:08 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
2021-11-15 22:34 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2021-11-15 22:46 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2021-11-15 22:46 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Thomas Munro <thomas.munro@gmail.com>; pgsql-hackers
Hi,
On 2021-11-15 17:34:33 -0500, Tom Lane wrote:
> Thomas Munro <thomas.munro@gmail.com> writes:
> > ... The interesting thing about 16.1 is that you can invoke it
> > as xlclang to get the new clang frontend and, I think, possibly use
> > more clang/gcc-ish compiler switches[2].
> > [2] https://www.ibm.com/docs/en/xl-c-and-cpp-aix/16.1?topic=new-clang-based-front-end
>
> Ho, that's an earful ;-). Though I wonder whether that frontend
> hides the AIX-specific linking issues you mentioned. (Also, although
> I see /opt/IBM/xlc/16.1.0/ on gcc119, there's no xlclang there.
> So whether we have useful access to it right now is unclear.)
It's actually available there, but in /opt/IBM/xlC/16.1.0/bin/xlclang++ (note
the upper case C).
It doesn't really hide the linking issues afaict. I think they're basically an
ABI rather than a linker invocation issue. It's not that hard to address them
though, it's basically making mkldexport.sh a tiny bit more general and
integrating it into src/backend/postgres' build.
We don't have to generate export files for shared libraries anymore though,
afaict, because there's 'expall', which suffices for our purposes. dlopen()
doesn't require an import file.
> This plays into something that was nagging at me while I wrote my
> upthread screed about not giving up on non-gcc/clang compilers:
> are those compilers outcompeting all the proprietary ones, to the
> extent that the latter will be dead soon anyway?
I think that's a pretty clear trend. The ones that aren't dying seem to be
incrementally onto more and more rebasing onto llvm tooling.
It doesn't help that most of those compilers are primarily for OSs that, uh,
aren't exactly growing. Which limits their potential usability significantly.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 22:08 ` Re: [RFC] building postgres with meson Thomas Munro <thomas.munro@gmail.com>
@ 2021-11-15 22:52 ` Thomas Munro <thomas.munro@gmail.com>
1 sibling, 0 replies; 143+ messages in thread
From: Thomas Munro @ 2021-11-15 22:52 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
On Tue, Nov 16, 2021 at 11:08 AM Thomas Munro <thomas.munro@gmail.com> wrote:
> FWIW there's a free-as-in-beer edition of xlc for Linux (various
> distros, POWER only) so you could use qemu,
(It's also known to be possible to run AIX 7.2 on qemu, but the
install media is not made available to developers for testing/CI
without a hardware serial number. Boo.)
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2021-11-18 20:44 ` Thomas Munro <thomas.munro@gmail.com>
2 siblings, 0 replies; 143+ messages in thread
From: Thomas Munro @ 2021-11-18 20:44 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
On Tue, Nov 16, 2021 at 8:23 AM Andres Freund <andres@anarazel.de> wrote:
> On 2021-11-15 14:11:25 -0500, Tom Lane wrote:
> > (In fact, unless somebody renews fossa/husky's
> > icc license, the three xlc animals will be an outright majority of
> > them, because wrasse and anole are the only other active animals with
> > non-mainstream compilers.)
>
> It should probably be doable to get somebody to run another icc animal. Icc is
> supported by meson, fwiw.
FWIW, in case someone is interested in bringing ICC back to the farm,
some light googling tells me that newer editions of "classic" ICC (as
opposed to "data parallel" ICC, parts of some kind of rebrand) no
longer require regular licence bureaucracy, and can be installed in
modern easier to maintain ways. For example, I see that some people
add Intel's APT repository and apt-get install the compiler inside CI
jobs, on Ubuntu.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-02-09 10:06 ` Joel Jacobson <joel@compiler.org>
11 siblings, 0 replies; 143+ messages in thread
From: Joel Jacobson @ 2022-02-09 10:06 UTC (permalink / raw)
To: pgsql-hackers@lists.postgresql.org
On Tue, Oct 12, 2021, at 10:37, Andres Freund wrote:
> - PGXS - and I don't yet know what to best do about it. One
> backward-compatible way would be to continue use makefiles for pgxs,
> but do the necessary replacement of Makefile.global.in via meson (and
> not use that for postgres' own build). But that doesn't really
> provide a nicer path for building postgres extensions on windows, so
> it'd definitely not be a long-term path.
To help evaluate meson, I've put together a list consisting of 6165 Github repos with (?m)^PGXS in the Makefile.
It's structured in the alphabetical order of each parent repo, with possible children repos underneath, using Markdown nested lists.
https://github.com/joelonsql/postgresql-extension-repos
Perhaps such a list could be useful also for other purposes as well,
maybe to create some new type of automated tests.
/Joel
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-03-09 16:55 ` Andres Freund <andres@anarazel.de>
11 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-03-09 16:55 UTC (permalink / raw)
To: pgsql-hackers
Hi,
One thing that's pretty cool with ninja based builds is that it contains a
dependency log of "discovered" dependencies as well as information about
dependencies "encoded" in the build specification. LLVM contains a script that
uses that dependency information to see whether the build specification is
missing any dependencies - this helped me find several "build bugs".
The script is at:
https://github.com/llvm/llvm-project/blob/main/llvm/utils/check_ninja_deps.py
It just needs to be invoked in the build directory after a build.
If I e.g. remove the dependency from libpgcommon_srv.a to the lwlocknames.h
generation (*) it complains with:
error: src/common/libpgcommon_srv.a.p/cryptohash_openssl.c.o requires src/include/storage/lwlocknames.h but has no dependency on it
error: src/common/libpgcommon_srv.a.p/hmac_openssl.c.o requires src/include/storage/lwlocknames.h but has no dependency on it
I wonder if it's worth having a build target invoking it? But how to get the
path to the script? We could just copy it into src/tools? It's permissively
licensed...
Greetings,
Andres Freund
(*) It seems architecturally pretty darn ugly for pgcommon to acquire lwlocks.
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-05-26 00:47 ` Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
11 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-05-26 00:47 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi Tom,
in the meson unconference session you'd spotted flex flags for psqlscanslash.l
(I think) being "hardcoded". As far as I can tell that's largely just copied
from the Makefile):
src/backend/parser/Makefile:scan.c: FLEXFLAGS = -CF -p -p
src/backend/utils/adt/Makefile:jsonpath_scan.c: FLEXFLAGS = -CF -p -p
src/bin/psql/Makefile:psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
src/fe_utils/Makefile:psqlscan.c: FLEXFLAGS = -Cfe -p -p
note that it's not even FLEXFLAGS += or such.
I honestly don't know enough about the various flex flags to judge what a
better approach would be? Looks like these flags are case specific? Perhaps we
could group them, i.e. have centrally defined "do compress" "don't compress"
flex flags?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-05-26 01:38 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-05-26 01:38 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> in the meson unconference session you'd spotted flex flags for psqlscanslash.l
> (I think) being "hardcoded". As far as I can tell that's largely just copied
> from the Makefile):
> src/backend/parser/Makefile:scan.c: FLEXFLAGS = -CF -p -p
> src/backend/utils/adt/Makefile:jsonpath_scan.c: FLEXFLAGS = -CF -p -p
> src/bin/psql/Makefile:psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
> src/fe_utils/Makefile:psqlscan.c: FLEXFLAGS = -Cfe -p -p
Hmm, OK. There *is* a FLEXFLAGS definition supplied by configure, and
I believe many of our scanners do use it, but evidently we're just
overriding it for the ones where we really care about using specific
flags. It also looks like the configure-supplied version is usually
empty, so the fact that this variable exists may be mostly a holdover
from Autoconf practice rather than something we ever cared about.
I think the main thing I didn't like about the way you have it in the
meson file is the loss of greppability. I could investigate this
question in a few seconds just now, but if we drop the use of
FLEXFLAGS as a macro it'll become much harder to figure out which
places use what.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-05-26 02:41 ` Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-05-26 02:41 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: pgsql-hackers
Hi,
On 2022-05-25 21:38:33 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > in the meson unconference session you'd spotted flex flags for psqlscanslash.l
> > (I think) being "hardcoded". As far as I can tell that's largely just copied
> > from the Makefile):
>
> > src/backend/parser/Makefile:scan.c: FLEXFLAGS = -CF -p -p
> > src/backend/utils/adt/Makefile:jsonpath_scan.c: FLEXFLAGS = -CF -p -p
> > src/bin/psql/Makefile:psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
> > src/fe_utils/Makefile:psqlscan.c: FLEXFLAGS = -Cfe -p -p
>
> Hmm, OK. There *is* a FLEXFLAGS definition supplied by configure, and
> I believe many of our scanners do use it, but evidently we're just
> overriding it for the ones where we really care about using specific
> flags. It also looks like the configure-supplied version is usually
> empty, so the fact that this variable exists may be mostly a holdover
> from Autoconf practice rather than something we ever cared about.
Yea, it looks like that.
ISTM that it'd still be good to have something like FLEXFLAGS. But it doesn't
look great, nor really intentional, that FLEXFLAGS is overwritten rather than
appended?
> I think the main thing I didn't like about the way you have it in the
> meson file is the loss of greppability. I could investigate this
> question in a few seconds just now, but if we drop the use of
> FLEXFLAGS as a macro it'll become much harder to figure out which
> places use what.
I disliked a bunch of repetitiveness as I had it, so I'm polishing that part
just now.
What would you want to grep for? Places that specify additional flags? Or just
places using flex?
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-05-26 02:58 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-05-26 02:58 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2022-05-25 21:38:33 -0400, Tom Lane wrote:
>> I think the main thing I didn't like about the way you have it in the
>> meson file is the loss of greppability.
> What would you want to grep for? Places that specify additional flags? Or just
> places using flex?
Well, the consistency of having a single name for "flags given to
flex" seems to me to be worth something.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-05-26 08:47 ` Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Aleksander Alekseev @ 2022-05-26 08:47 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi Andres,
Thanks for working on this! I'm very enthusiastic about this effort and I was
glad to see on PGCon Unconference that the majority of the community seems
to be as well.
> The halfway decent list includes, I think:
> 1) cmake
> 2) bazel
> 3) meson
Was SCons considered as an option? It is widely adopted and written in Python
as well. Personally, I like the fact that with SCons you write config files
in pure Python, not some dialect you have to learn additionally. There is
a free e-book available [1].
What pros and cons do you see that make Meson a better choice?
[1]: https://scons.org/doc/production/PDF/scons-user.pdf
--
Best regards,
Aleksander Alekseev
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-05-28 19:14 ` Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-05-28 19:14 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi,
On 2022-05-26 11:47:13 +0300, Aleksander Alekseev wrote:
> Thanks for working on this! I'm very enthusiastic about this effort and I was
> glad to see on PGCon Unconference that the majority of the community seems
> to be as well.
>
> > The halfway decent list includes, I think:
> > 1) cmake
> > 2) bazel
> > 3) meson
>
> Was SCons considered as an option?
> What pros and cons do you see that make Meson a better choice?
I looked at it and quickly discarded it. From what I could see there's not
been meaningful moves to it in the last couple years, if anything adoption has
been dropping. And I don't think we want to end up relying on yet another half
maintained tool.
Not having a ninja backend etc didn't strike me as great either - the builds
with scons I've done weren't fast at all.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-05-31 13:49 ` Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Aleksander Alekseev @ 2022-05-31 13:49 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi Andres,
> Not having a ninja backend etc didn't strike me as great either - the builds
> with scons I've done weren't fast at all.
I must admit, personally I never used Scons, I just know that it was considered
(an / the only?) alternative to CMake for many years. The Scons 4.3.0 release
notes say that Ninja is supported [1], but according to the user guide [2]
Ninja support is considered experimental.
Don't get me wrong, I don't insist on using Scons. I was just curious if it was
considered. Actually, a friend of mine pointed out that the fact that Scons
build files are literally a Python code could be a disadvantage. There is less
control of this code, basically it can do anything. It could complicate the
diagnosis of certain issues, etc.
Since you invested so much effort into Meson already let's just focus on it.
I tried the branch on GitHub on MacOS Monterey 12.3.1 and Ubuntu 20.04 LTS.
I was going to test it against several third party extensions, but it looks like
it is a bit early for this. On Ubuntu I got the following error:
```
../src/include/parser/kwlist.h:332:25: error: ‘PARAMETER’ undeclared here (not
in a function)
332 | PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
../src/interfaces/ecpg/preproc/keywords.c:32:55: note: in definition of macro
‘PG_KEYWORD’
32 | #define PG_KEYWORD(kwname, value, category, collabel) value,
```
On MacOS I got multiple errors regarding LDAP:
```
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/
LDAP.framework/Headers/ldap.h:1:10: error: #include nested too deeply
#include <ldap.h>
../src/interfaces/libpq/fe-connect.c:4816:2: error: use of undeclared
identifier 'LDAP'
LDAP *ld = NULL;
^
../src/interfaces/libpq/fe-connect.c:4817:2: error: use of undeclared
identifier 'LDAPMessage'
LDAPMessage *res,
^
... etc...
```
I didn't invest much time into investigating these issues. For now I just
wanted to report them. Please let me know if you need any help with these
and/or additional information.
[1]: https://scons.org/scons-430-is-available.html
[2]: https://scons.org/doc/production/PDF/scons-user.pdf
--
Best regards,
Aleksander Alekseev
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-05-31 19:25 ` Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-05-31 19:25 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi,
On 2022-05-31 16:49:17 +0300, Aleksander Alekseev wrote:
> I tried the branch on GitHub on MacOS Monterey 12.3.1 and Ubuntu 20.04 LTS.
> I was going to test it against several third party extensions, but it looks like
> it is a bit early for this. On Ubuntu I got the following error:
What do those extensions use to build? Since the unconference I added some
rudimentary PGXS compatibility, but it's definitely not complete yet.
> ```
> ../src/include/parser/kwlist.h:332:25: error: ‘PARAMETER’ undeclared here (not
> in a function)
> 332 | PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
>
> ../src/interfaces/ecpg/preproc/keywords.c:32:55: note: in definition of macro
> ‘PG_KEYWORD’
> 32 | #define PG_KEYWORD(kwname, value, category, collabel) value,
> ```
Huh. I've not seen this before - could you provide a bit more detail about
what you did? CI isn't testing ubuntu, but it is testing Debian, so I'd expect
this to work.
> On MacOS I got multiple errors regarding LDAP:
Ah, yes. Sorry, that's an open issue that I need to fix. -Dldap=disabled for
the rescue. There's some crazy ordering dependency in macos framework
headers. The ldap framework contains an "ldap.h" header that includes
"ldap.h". So if you end up with the framework on the include path, you get
endless recursion.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-01 09:39 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-01 21:05 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Aleksander Alekseev @ 2022-06-01 09:39 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi Andres,
> What do those extensions use to build? Since the unconference I added some
> rudimentary PGXS compatibility, but it's definitely not complete yet.
We mostly use CMake and Cargo, the Rust package manager. So I don't
anticipate many problems here, just want to make sure it's going to
work as expected.
> > ```
> > ../src/include/parser/kwlist.h:332:25: error: ‘PARAMETER’ undeclared here (not
> > in a function)
> > 332 | PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
> >
> > ../src/interfaces/ecpg/preproc/keywords.c:32:55: note: in definition of macro
> > ‘PG_KEYWORD’
> > 32 | #define PG_KEYWORD(kwname, value, category, collabel) value,
> > ```
>
> Huh. I've not seen this before - could you provide a bit more detail about
> what you did? CI isn't testing ubuntu, but it is testing Debian, so I'd expect
> this to work.
I used PIP to install Meson, since the default APT package is too old, v0.53:
$ pip3 install --user meson
$ meson --version
0.62.1
$ ninja --version
1.10.0
The branch was checked out as it was described in the first email.
Then to reproduce the issue:
$ git status
On branch meson
Your branch is up to date with 'andres/meson'.
$ git fetch andres
$ git rebase -i andres/meson
$ meson setup build --buildtype debug
$ cd build
$ ninja
This is pretty much the default Ubuntu 20.04.4 LTS system with all the
recent updates installed, so it shouldn't be a problem to reproduce
the issue with a VM.
> > On MacOS I got multiple errors regarding LDAP:
>
> Ah, yes. Sorry, that's an open issue that I need to fix. -Dldap=disabled for
> the rescue. There's some crazy ordering dependency in macos framework
> headers. The ldap framework contains an "ldap.h" header that includes
> "ldap.h". So if you end up with the framework on the include path, you get
> endless recursion.
Thanks, this helped. I did the following:
$ meson configure -Dldap=disabled
$ meson configure -Dssl=openssl
$ meson configure -Dprefix=/Users/eax/pginstall
$ ninja
$ meson test
$ meson install
... and it terminated successfully. I was also able to configure and
run Postgres instance using my regular scripts, with some
modifications [1]
Then I decided to compile TimescaleDB against the newly installed
Postgres. Turns out there is a slight problem.
The extension uses CMake and also requires PostgreSQL to be compiled
with OpenSSL support. CMakeLists.txt looks for a
"--with-(ssl=)?openssl" regular expression in the "pg_config
--configure" output. The output is empty although Postgres was
compiled with OpenSSL support. The full output of pg_config looks like
this:
```
CONFIGURE =
CC = not recorded
CPPFLAGS = not recorded
CFLAGS = not recorded
CFLAGS_SL = not recorded
... etc ...
```
I get a bunch of errors from the compiler if I remove this particular
check from CMakeLists, but I have to investigate these a bit more
since the branch is based on PG15 and we don't officially support PG15
yet. It worked last time we checked a month or so ago, but the
situation may have changed.
[1]: https://github.com/afiskon/pgscripts/blob/master/single-install.sh
--
Best regards,
Aleksander Alekseev
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-06-01 21:05 ` Andres Freund <andres@anarazel.de>
2022-06-02 12:34 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-06-01 21:05 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi,
On 2022-06-01 12:39:50 +0300, Aleksander Alekseev wrote:
> > > ```
> > > ../src/include/parser/kwlist.h:332:25: error: ‘PARAMETER’ undeclared here (not
> > > in a function)
> > > 332 | PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
> > >
> > > ../src/interfaces/ecpg/preproc/keywords.c:32:55: note: in definition of macro
> > > ‘PG_KEYWORD’
> > > 32 | #define PG_KEYWORD(kwname, value, category, collabel) value,
> > > ```
> >
> > Huh. I've not seen this before - could you provide a bit more detail about
> > what you did? CI isn't testing ubuntu, but it is testing Debian, so I'd expect
> > this to work.
>
> I used PIP to install Meson, since the default APT package is too old, v0.53:
>
> $ pip3 install --user meson
> $ meson --version
> 0.62.1
> $ ninja --version
> 1.10.0
>
> The branch was checked out as it was described in the first email.
> Then to reproduce the issue:
>
> $ git status
> On branch meson
> Your branch is up to date with 'andres/meson'.
> $ git fetch andres
> $ git rebase -i andres/meson
> $ meson setup build --buildtype debug
> $ cd build
> $ ninja
>
> This is pretty much the default Ubuntu 20.04.4 LTS system with all the
> recent updates installed, so it shouldn't be a problem to reproduce
> the issue with a VM.
Will test.
> > > On MacOS I got multiple errors regarding LDAP:
> >
> > Ah, yes. Sorry, that's an open issue that I need to fix. -Dldap=disabled for
> > the rescue. There's some crazy ordering dependency in macos framework
> > headers. The ldap framework contains an "ldap.h" header that includes
> > "ldap.h". So if you end up with the framework on the include path, you get
> > endless recursion.
>
> Thanks, this helped.
Cool. I think I pushed a fix/workaround for the issue now. Still can't decide
whether it's apple's or meson's fault.
> I did the following:
>
> $ meson configure -Dldap=disabled
> $ meson configure -Dssl=openssl
> $ meson configure -Dprefix=/Users/eax/pginstall
FYI, you can set multiple options in one go ;)
> ... and it terminated successfully. I was also able to configure and
> run Postgres instance using my regular scripts, with some
> modifications [1]
Cool.
> Then I decided to compile TimescaleDB against the newly installed
> Postgres. Turns out there is a slight problem.
>
> The extension uses CMake and also requires PostgreSQL to be compiled
> with OpenSSL support. CMakeLists.txt looks for a
> "--with-(ssl=)?openssl" regular expression in the "pg_config
> --configure" output. The output is empty although Postgres was
> compiled with OpenSSL support.
Makes sense. Currently we don't fill the --configure thing, because there
configure wasn't used. We could try to generate something compatible from
meson options, but I'm not sure that's a good plan.
> The full output of pg_config looks like
> this:
>
> ```
> CONFIGURE =
> CC = not recorded
> CPPFLAGS = not recorded
> CFLAGS = not recorded
> CFLAGS_SL = not recorded
> ... etc ...
> ```
>
> I get a bunch of errors from the compiler if I remove this particular
> check from CMakeLists, but I have to investigate these a bit more
> since the branch is based on PG15 and we don't officially support PG15
> yet. It worked last time we checked a month or so ago, but the
> situation may have changed.
I suspect the errors might be due to CC/CPPFLAGS/... not being defined. I can
try to make it output something roughly compatible with the old output, for
most of those I already started to compute values for the PGXS compat stuff I
was hacking on recently.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-01 21:05 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-02 12:34 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 15:22 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Aleksander Alekseev @ 2022-06-02 12:34 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi Andres,
> Cool. I think I pushed a fix/workaround for the issue now. Still can't decide
> whether it's apple's or meson's fault.
Many thanks! The fix solved the problem, I can compile with -Dldap=enabled now.
The code passes the tests too.
> > $ meson configure -Dldap=disabled
> > $ meson configure -Dssl=openssl
> > $ meson configure -Dprefix=/Users/eax/pginstall
>
> FYI, you can set multiple options in one go ;)
Thanks! ;)
> Makes sense. Currently we don't fill the --configure thing, because there
> configure wasn't used. We could try to generate something compatible from
> meson options, but I'm not sure that's a good plan.
If pg_config output was 100% backward compatible with Autotools one, that would
simplify the lives of the extension developers for sure. However, considering
that at PGCon we agreed that both Autotools and Meson will be maintained for
several releases, personally I wouldn't say that this compatibility is
necessary, nor is it realistically deliverable. Nevertheless, IMO there should
be a stable and documented way to determine the PostgreSQL version (this can be
done with `pg_config --version` for both Autotools and Meson), the build tool
used (no way to determine) and the build options (no way to determine
for Meson).
> I suspect the errors might be due to CC/CPPFLAGS/... not being defined. I can
> try to make it output something roughly compatible with the old output, for
> most of those I already started to compute values for the PGXS compat stuff I
> was hacking on recently.
Yes, that could explain the problem. Just for the record, I get several errors
regarding src/export.h in TimescaleDB code [1]:
```
/Users/eax/projects/c/timescaledb/src/export.h:26:5: error: pasting formed
')87628', an invalid preprocessing token [clang-diagnostic-error]
#if TS_EMPTY(PGDLLEXPORT)
^
/Users/eax/projects/c/timescaledb/src/export.h:17:22: note: expanded from
macro 'TS_EMPTY'
#define TS_EMPTY(x) (TS_CAT(x, 87628) == 87628)
^
/Users/eax/projects/c/timescaledb/src/export.h:15:23: note: expanded from
macro 'TS_CAT'
#define TS_CAT(x, y) x##y
^
/Users/eax/projects/c/timescaledb/src/export.h:26:14: error: function-like
macro '__attribute__' is not defined [clang-diagnostic-error]
#if TS_EMPTY(PGDLLEXPORT)
^
/Users/eax/pginstall/include/postgresql/server/c.h:1339:21: note: expanded
from macro 'PGDLLEXPORT'
#define PGDLLEXPORT __attribute__((visibility("default")))
^
/Users/eax/projects/c/timescaledb/src/export.h:30:2: error: "PGDLLEXPORT is
already defined" [clang-diagnostic-error]
#error "PGDLLEXPORT is already defined"
^
1 warning and 3 errors generated.
Error while processing /Users/eax/projects/c/timescaledb/src/extension.c
```
[1]: https://github.com/timescale/timescaledb/blob/main/src/export.h
--
Best regards,
Aleksander Alekseev
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-01 21:05 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 12:34 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-06-02 15:22 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-06-02 15:22 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi,
On 2022-06-02 15:34:23 +0300, Aleksander Alekseev wrote:
> Hi Andres,
>
> > Cool. I think I pushed a fix/workaround for the issue now. Still can't decide
> > whether it's apple's or meson's fault.
>
> Many thanks! The fix solved the problem, I can compile with -Dldap=enabled now.
> The code passes the tests too.
Cool.
> > I suspect the errors might be due to CC/CPPFLAGS/... not being defined. I can
> > try to make it output something roughly compatible with the old output, for
> > most of those I already started to compute values for the PGXS compat stuff I
> > was hacking on recently.
>
> Yes, that could explain the problem. Just for the record, I get several errors
> regarding src/export.h in TimescaleDB code [1]:
>
I think this is timescale's issue. Why are you defining / undefining
PGDLLEXPORT?
Part of the patch series is to use visibility attributes, and your #if
TS_EMPTY(PGDLLEXPORT) thing can't handle that.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-06-02 16:39 ` Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-06-02 16:39 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: pgsql-hackers; Tom Lane <tgl@sss.pgh.pa.us>
Hi,
On 2022-06-01 12:39:50 +0300, Aleksander Alekseev wrote:
> > > ```
> > > ../src/include/parser/kwlist.h:332:25: error: ‘PARAMETER’ undeclared here (not
> > > in a function)
> > > 332 | PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
> > >
> > > ../src/interfaces/ecpg/preproc/keywords.c:32:55: note: in definition of macro
> > > ‘PG_KEYWORD’
> > > 32 | #define PG_KEYWORD(kwname, value, category, collabel) value,
> > > ```
> >
> > Huh. I've not seen this before - could you provide a bit more detail about
> > what you did? CI isn't testing ubuntu, but it is testing Debian, so I'd expect
> > this to work.
>
> I used PIP to install Meson, since the default APT package is too old, v0.53:
>
> $ pip3 install --user meson
> $ meson --version
> 0.62.1
> $ ninja --version
> 1.10.0
>
> The branch was checked out as it was described in the first email.
> Then to reproduce the issue:
>
> $ git status
> On branch meson
> Your branch is up to date with 'andres/meson'.
> $ git fetch andres
> $ git rebase -i andres/meson
> $ meson setup build --buildtype debug
> $ cd build
> $ ninja
>
> This is pretty much the default Ubuntu 20.04.4 LTS system with all the
> recent updates installed, so it shouldn't be a problem to reproduce
> the issue with a VM.
Chatting with a colleague (who unbeknownst to me hit something similar in the
past) I think we figured it out. It's not due to Ubuntu 20.04 or such. It's
likely due to previously having an in-tree build with autoconf, doing make
clean, doing a git pull, then building with meson. The meson build doesn't yet
handle pre-existing flex / bison output.
I had tried to defend against conflicts with in-tree builds by detecting an
in-tree pg_config.h, but that doesn't help with files that aren't removed by
make clean. Like bison / flex output.
And I didn't notice this problem because it doesn't cause visible issues until
the lexer / grammar changes...
I'm not quite sure what the proper behaviour is when doing an out-of-tree
build with meson (all builds are out-of-tree), with a pre-existing flex /
bison output in the source tree that is out of date.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-02 17:08 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-06-02 17:08 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> I'm not quite sure what the proper behaviour is when doing an out-of-tree
> build with meson (all builds are out-of-tree), with a pre-existing flex /
> bison output in the source tree that is out of date.
Definitely sounds like a gotcha.
On the one hand, there's been some discussion already of removing all
derived files from tarballs and just insisting that users provide all
needed tools when building from source. If we did that, it could be
sufficient for the meson build to check that no such files are present
in the source tree. (Checking a couple of them would be enough, likely.)
On the other hand, I'm not sure that I want such a change to be forced
by a toolchain change. It definitely seems a bit contrary to the plan
we'd formed of allowing meson and make-based builds to coexist for
a few years, because we'd be breaking at least some make-based build
processes.
Could we have the meson build check that, say, if gram.c exists it
is newer than gram.y? Or get it to ignore an in-tree gram.c?
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-06-02 17:26 ` Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 2 replies; 143+ messages in thread
From: Andres Freund @ 2022-06-02 17:26 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-06-02 13:08:49 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > I'm not quite sure what the proper behaviour is when doing an out-of-tree
> > build with meson (all builds are out-of-tree), with a pre-existing flex /
> > bison output in the source tree that is out of date.
>
> Definitely sounds like a gotcha.
>
> On the one hand, there's been some discussion already of removing all
> derived files from tarballs and just insisting that users provide all
> needed tools when building from source. If we did that, it could be
> sufficient for the meson build to check that no such files are present
> in the source tree. (Checking a couple of them would be enough, likely.)
There already is a check for pg_config.h, so the most obvious source of this
is addressed. Just didn't think about the files that make clean doesn't remove
:/.
> On the other hand, I'm not sure that I want such a change to be forced
> by a toolchain change. It definitely seems a bit contrary to the plan
> we'd formed of allowing meson and make-based builds to coexist for
> a few years, because we'd be breaking at least some make-based build
> processes.
Agreed. I think it'd be pretty reasonable to not include flex / bison
output. They're not hard to acquire. The docs are perhaps another story.
I think it might be fine to say that make reallyclean (*) is required if
there's some conflicting in-source tree file?
> Could we have the meson build check that, say, if gram.c exists it
> is newer than gram.y? Or get it to ignore an in-tree gram.c?
I suspect the problem with ignoring is gram.h, that's probably a bit harder to
ignore. Right now I'm leaning towards either always erroring out if there's
bison/flex output in the source tree (with a hint towards make
reallyclean(*)), or erroring out if they're out of date (again with a hint
towards reallyclean)?
Alternatively we could just remove the generated .c/h files from the source
dir, as a part of regenerating them in the build dir? But I like the idea of
the source dir being readonly outside of explicit targets modifying sources
(e.g. update-unicode or such).
Greetings,
Andres Freund
(*) do we really not have a target that removes bison / flex output?
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-02 17:33 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
1 sibling, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-06-02 17:33 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> (*) do we really not have a target that removes bison / flex output?
maintainer-clean
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-06-02 17:48 ` Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-06-02 17:48 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-06-02 13:33:51 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > (*) do we really not have a target that removes bison / flex output?
>
> maintainer-clean
Don't think so:
# gram.c, gram.h, and scan.c are in the distribution tarball, so they
# are not cleaned here.
clean distclean maintainer-clean:
rm -f lex.backup
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-02 19:05 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-06-02 19:05 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> On 2022-06-02 13:33:51 -0400, Tom Lane wrote:
>> Andres Freund <andres@anarazel.de> writes:
>>> (*) do we really not have a target that removes bison / flex output?
>> maintainer-clean
> Don't think so:
See about line 300 in src/backend/Makefile. In any case, it's
easy to show by experiment that it does.
$ make maintainer-clean
...
$ git status --ignored
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-06-02 19:17 ` Andres Freund <andres@anarazel.de>
2022-06-02 19:53 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-06-02 19:17 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-06-02 15:05:10 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > On 2022-06-02 13:33:51 -0400, Tom Lane wrote:
> >> Andres Freund <andres@anarazel.de> writes:
> >>> (*) do we really not have a target that removes bison / flex output?
>
> >> maintainer-clean
>
> > Don't think so:
>
> See about line 300 in src/backend/Makefile. In any case, it's
> easy to show by experiment that it does.
>
> $ make maintainer-clean
> ...
> $ git status --ignored
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
Oh. I executed maintainer-clean inside src/backend/parser/, and thus didn't
see it getting cleaned up.
It seems pretty darn grotty that src/backend/parser/Makefile explicitly states
that gram.c ... aren't cleaned "here", but then src/backend/Makefile does
clean them up.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-02 19:53 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 21:13 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Tom Lane @ 2022-06-02 19:53 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Andres Freund <andres@anarazel.de> writes:
> Oh. I executed maintainer-clean inside src/backend/parser/, and thus didn't
> see it getting cleaned up.
> It seems pretty darn grotty that src/backend/parser/Makefile explicitly states
> that gram.c ... aren't cleaned "here", but then src/backend/Makefile does
> clean them up.
I agree the factorization of this ain't great. I'd think about improving
it, were it not that we're trying to get rid of it.
(But with meson, the whole idea of building or cleaning just part of the
tree is out the window anyway, no?)
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:53 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-06-02 21:13 ` Andres Freund <andres@anarazel.de>
2022-06-03 09:35 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
0 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-06-02 21:13 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-06-02 15:53:50 -0400, Tom Lane wrote:
> Andres Freund <andres@anarazel.de> writes:
> > Oh. I executed maintainer-clean inside src/backend/parser/, and thus didn't
> > see it getting cleaned up.
>
> > It seems pretty darn grotty that src/backend/parser/Makefile explicitly states
> > that gram.c ... aren't cleaned "here", but then src/backend/Makefile does
> > clean them up.
>
> I agree the factorization of this ain't great. I'd think about improving
> it, were it not that we're trying to get rid of it.
+1. I think I just wanted to excuse my confusion...
> (But with meson, the whole idea of building or cleaning just part of the
> tree is out the window anyway, no?)
Cleaning parts of the tree isn't supported as far as I know (not that I've
needed it). You can build parts of the tree by specifying the target
(e.g. ninja src/backend/postgres) or by specifying meta-targets (e.g. ninja
contrib backend). I've thought about contributing a patch to meson to
automatically generate targets for each directory that has sub-targets - it's
just a few lines.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:53 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 21:13 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-06-03 09:35 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-03 16:23 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Aleksander Alekseev @ 2022-06-03 09:35 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
Hi hackers,
> See about line 300 in src/backend/Makefile. In any case, it's
> easy to show by experiment that it does.
`make maintainer-clean` did the trick, thanks. I suggest modifying meson.build
accordingly:
-run make distclean in the source tree.
+run `make maintainer-clean` in the source tree.
> I think this is timescale's issue. Why are you defining / undefining
> PGDLLEXPORT?
That's a great question.
As I understand some time ago the developers had a problem with a collision of
exported symbols on *nix platforms [1] and chose to solve it by re-defining
PGDLLEXPORT to __attribute__((visibility ("default"))) for GCC and CLang.
I agree that this is a questionable approach. Redefining a macro provided
by Postgres doesn't strike me as a good idea. I tried to remove this
re-definition, but it didn't go well [2]. So apparently it should be addressed
somehow differently.
> Part of the patch series is to use visibility attributes, and your #if
> TS_EMPTY(PGDLLEXPORT) thing can't handle that.
Out of curiosity, how come a patchset that adds an alternative build system
changes the visibility attributes? I would guess they should be the same
for both Autotools and Meson. Is it necessary in order to make Meson work?
If not, maybe it should be a separate patch.
[1]: https://github.com/timescale/timescaledb/commit/027b7b29420a742d7615c70d9f19b2b99c488c2c
[2]: https://github.com/timescale/timescaledb/pull/4413
--
Best regards,
Aleksander Alekseev
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 19:53 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 21:13 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-03 09:35 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
@ 2022-06-03 16:23 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-06-03 16:23 UTC (permalink / raw)
To: Aleksander Alekseev <aleksander@timescale.com>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; pgsql-hackers
Hi,
On 2022-06-03 12:35:45 +0300, Aleksander Alekseev wrote:
> > Part of the patch series is to use visibility attributes, and your #if
> > TS_EMPTY(PGDLLEXPORT) thing can't handle that.
>
> Out of curiosity, how come a patchset that adds an alternative build system
> changes the visibility attributes?
It was the simplest path - on windows (and AIx) extension symbols need to be
explicitly exported. We did that by building the objects constituting
extension libraries, collecting the symbols, generating an export file with
all the symbols, which then is passed to the linker. It was a lot less work
to just add the necessary PGDLLEXPORT annotations than make that export file
generation work for extensions.
> I would guess they should be the same for both Autotools and Meson.
It is, the patch adds it to both.
> Is it necessary in order to make Meson work?
Yes, or at least the simplest path.
> If not, maybe it should be a separate patch.
It is.
https://commitfest.postgresql.org/38/3396/
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-08-10 17:19 ` Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
1 sibling, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-08-10 17:19 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-06-02 10:26:09 -0700, Andres Freund wrote:
> > Could we have the meson build check that, say, if gram.c exists it
> > is newer than gram.y? Or get it to ignore an in-tree gram.c?
>
> I suspect the problem with ignoring is gram.h, that's probably a bit harder to
> ignore.
I tried to ignore various generated files in the source tree, but I don't
think it's doable for all of them. Consider
e.g. src/backend/utils/misc/guc-file.c which is gets built via #include
"guc-file.c" from gram.c
Because it's a "" include, the search path starts in the current directory and
only then -I is searched. To my knowledge there's no way of changing
that. Quoting the gcc manpage:
-I dir
-iquote dir
-isystem dir
-idirafter dir
Add the directory dir to the list of directories to be searched for header files during preprocessing. If dir begins with = or $SYSROOT, then
the = or $SYSROOT is replaced by the sysroot prefix; see --sysroot and -isysroot.
Directories specified with -iquote apply only to the quote form of the directive, "#include "file"". Directories specified with -I, -isystem, or
-idirafter apply to lookup for both the "#include "file"" and "#include <file>" directives.
You can specify any number or combination of these options on the command line to search for header files in several directories. The lookup
order is as follows:
1. For the quote form of the include directive, the directory of the current file is searched first.
2. For the quote form of the include directive, the directories specified by -iquote options are searched in left-to-right order, as they appear
on the command line.
3. Directories specified with -I options are scanned in left-to-right order.
[...]
Except for copying guc.c from source to build tree before building, I don't
see a way of ignoring the in-build-tree guc-file.c.
Not sure what a good way of dealing with this is. For now I'll make it just
error out if there's any known such file in the source tree, but that's not a
good solution forever. If it were just "normal" build leftovers I'd propose
to (optionally) just remove them, but that's not good for tarballs.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-08-11 03:33 ` John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 1 reply; 143+ messages in thread
From: John Naylor @ 2022-08-11 03:33 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
On Thu, Aug 11, 2022 at 12:19 AM Andres Freund <andres@anarazel.de> wrote:
> I tried to ignore various generated files in the source tree, but I don't
> think it's doable for all of them. Consider
> e.g. src/backend/utils/misc/guc-file.c which is gets built via #include
> "guc-file.c" from gram.c
With a bit of work, we could probably get rid of those includes. See
27199058d98ef7f for one example.
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2022-08-11 03:37 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:45 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
0 siblings, 2 replies; 143+ messages in thread
From: Tom Lane @ 2022-08-11 03:37 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
John Naylor <john.naylor@enterprisedb.com> writes:
> With a bit of work, we could probably get rid of those includes. See
> 27199058d98ef7f for one example.
Yeah --- it would mean creating gram.h files for all the bison grammars
not just a few of them, but it's certainly do-able if there's motivation
to make the changes. Most of the files that are done that way date
from before we knew about flex's %top.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-08-11 03:45 ` Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 0 replies; 143+ messages in thread
From: Tom Lane @ 2022-08-11 03:45 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
I wrote:
> John Naylor <john.naylor@enterprisedb.com> writes:
>> With a bit of work, we could probably get rid of those includes. See
>> 27199058d98ef7f for one example.
> Yeah --- it would mean creating gram.h files for all the bison grammars
> not just a few of them, but it's certainly do-able if there's motivation
> to make the changes. Most of the files that are done that way date
> from before we knew about flex's %top.
BTW, 72b1e3a21 is another useful precedent in this area.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
@ 2022-08-11 03:57 ` John Naylor <john.naylor@enterprisedb.com>
2022-08-11 04:07 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 04:32 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 2 replies; 143+ messages in thread
From: John Naylor @ 2022-08-11 03:57 UTC (permalink / raw)
To: Tom Lane <tgl@sss.pgh.pa.us>; +Cc: Andres Freund <andres@anarazel.de>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
On Thu, Aug 11, 2022 at 10:37 AM Tom Lane <tgl@sss.pgh.pa.us> wrote:
>
> John Naylor <john.naylor@enterprisedb.com> writes:
> > With a bit of work, we could probably get rid of those includes. See
> > 27199058d98ef7f for one example.
>
> Yeah --- it would mean creating gram.h files for all the bison grammars
> not just a few of them, but it's certainly do-able if there's motivation
> to make the changes. Most of the files that are done that way date
> from before we knew about flex's %top.
I'll volunteer to work on this unless an easier solution happens to
come along in the next couple days. (aside: guc-file.l doesn't have a
grammar, so not yet sure if that makes the issue easier or harder...)
--
John Naylor
EDB: http://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2022-08-11 04:07 ` Andres Freund <andres@anarazel.de>
1 sibling, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-08-11 04:07 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Tom Lane <tgl@sss.pgh.pa.us>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
Hi,
On 2022-08-11 10:57:33 +0700, John Naylor wrote:
> I'll volunteer to work on this unless an easier solution happens to
> come along in the next couple days.
Cool!
> (aside: guc-file.l doesn't have a grammar, so not yet sure if that makes the
> issue easier or harder...)
I think we should consider compiling it separately from guc.c. guc.c already
compiles quite slowly (iirc beat only by ecpg and main grammar), and it's a
relatively commonly changed source file.
It might even be a good idea to split guc.c so it only contains the settings
arrays + direct dependencies...
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Re: [RFC] building postgres with meson Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 16:39 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Re: [RFC] building postgres with meson Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:57 ` Re: [RFC] building postgres with meson John Naylor <john.naylor@enterprisedb.com>
@ 2022-08-11 04:32 ` Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 0 replies; 143+ messages in thread
From: Tom Lane @ 2022-08-11 04:32 UTC (permalink / raw)
To: John Naylor <john.naylor@enterprisedb.com>; +Cc: Andres Freund <andres@anarazel.de>; Aleksander Alekseev <aleksander@timescale.com>; pgsql-hackers
John Naylor <john.naylor@enterprisedb.com> writes:
> I'll volunteer to work on this unless an easier solution happens to
> come along in the next couple days. (aside: guc-file.l doesn't have a
> grammar, so not yet sure if that makes the issue easier or harder...)
That one's probably mostly about the issue mentioned in the other
commit you identified. Without %top, it's impossible to make a
standalone flex module honor the rule about thou-shalt-have-no-
other-includes-before-postgres.h. So embedding it in some other
file was originally a necessity for that. Now that we know how
to fix that, it's just a matter of making sure that any other stuff
the scanner needs is available from a .h file.
regards, tom lane
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-08-09 07:10 ` Andres Freund <andres@anarazel.de>
2022-08-09 12:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
11 siblings, 1 reply; 143+ messages in thread
From: Andres Freund @ 2022-08-09 07:10 UTC (permalink / raw)
To: pgsql-hackers@postgresql.org, Andrew Dunstan <andrew@dunslane.net>; Magnus Hagander <magnus@hagander.net>
Hi,
I was looking at re-unifying gendef2.pl that the meson patchset had introduced
for temporary ease during hacking with gendef.pl. Testing that I noticed that
either I and my machine is very confused, or gendef.pl's check whether it can
skip work is bogus.
I noticed that, despite having code to avoid rerunning when the input files
are older than the .def file, it always runs.
# if the def file exists and is newer than all input object files, skip
# its creation
if (-f $deffile
&& (-M $deffile > max(map { -M } <$ARGV[0]/*.obj>)))
{
print "Not re-generating $defname.DEF, file already exists.\n";
exit(0);
}
My understanding of -M is that it returns the time delta between the file
modification and the start of the script. Which makes the use of max() bogus,
since it'll return the oldest time any input has been modified, not the
newest. And the condition needs to be inverted, because we want to skip the
work if $deffile is *newer*, right?
Am I missing something here?
I'm tempted to just remove the not-regenerating logic - gendef.pl shouldn't
run if there's nothing to do, and it'll e.g. not notice if there's an
additional input that wasn't there during the last invocation of gendef.pl.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-09 07:10 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
@ 2022-08-09 12:37 ` Andrew Dunstan <andrew@dunslane.net>
2022-08-21 00:42 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
0 siblings, 1 reply; 143+ messages in thread
From: Andrew Dunstan @ 2022-08-09 12:37 UTC (permalink / raw)
To: Andres Freund <andres@anarazel.de>; pgsql-hackers@postgresql.org, Magnus Hagander <magnus@hagander.net>
On 2022-08-09 Tu 03:10, Andres Freund wrote:
> Hi,
>
> I was looking at re-unifying gendef2.pl that the meson patchset had introduced
> for temporary ease during hacking with gendef.pl. Testing that I noticed that
> either I and my machine is very confused, or gendef.pl's check whether it can
> skip work is bogus.
>
> I noticed that, despite having code to avoid rerunning when the input files
> are older than the .def file, it always runs.
>
> # if the def file exists and is newer than all input object files, skip
> # its creation
> if (-f $deffile
> && (-M $deffile > max(map { -M } <$ARGV[0]/*.obj>)))
> {
> print "Not re-generating $defname.DEF, file already exists.\n";
> exit(0);
> }
>
> My understanding of -M is that it returns the time delta between the file
> modification and the start of the script. Which makes the use of max() bogus,
> since it'll return the oldest time any input has been modified, not the
> newest. And the condition needs to be inverted, because we want to skip the
> work if $deffile is *newer*, right?
>
> Am I missing something here?
No, you're right, this is bogus. Reversing the test and using min
instead of max is the obvious fix.
> I'm tempted to just remove the not-regenerating logic - gendef.pl shouldn't
> run if there's nothing to do, and it'll e.g. not notice if there's an
> additional input that wasn't there during the last invocation of gendef.pl.
>
Maybe, need to think about that more.
cheers
andrew
--
Andrew Dunstan
EDB: https://www.enterprisedb.com
^ permalink raw reply [nested|flat] 143+ messages in thread
* Re: [RFC] building postgres with meson
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-09 07:10 ` Re: [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2022-08-09 12:37 ` Re: [RFC] building postgres with meson Andrew Dunstan <andrew@dunslane.net>
@ 2022-08-21 00:42 ` Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 143+ messages in thread
From: Andres Freund @ 2022-08-21 00:42 UTC (permalink / raw)
To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-hackers@postgresql.org, Magnus Hagander <magnus@hagander.net>
Hi,
On 2022-08-09 08:37:16 -0400, Andrew Dunstan wrote:
> On 2022-08-09 Tu 03:10, Andres Freund wrote:
> > Hi,
> >
> > I was looking at re-unifying gendef2.pl that the meson patchset had introduced
> > for temporary ease during hacking with gendef.pl. Testing that I noticed that
> > either I and my machine is very confused, or gendef.pl's check whether it can
> > skip work is bogus.
> >
> > I noticed that, despite having code to avoid rerunning when the input files
> > are older than the .def file, it always runs.
> >
> > # if the def file exists and is newer than all input object files, skip
> > # its creation
> > if (-f $deffile
> > && (-M $deffile > max(map { -M } <$ARGV[0]/*.obj>)))
> > {
> > print "Not re-generating $defname.DEF, file already exists.\n";
> > exit(0);
> > }
> >
> > My understanding of -M is that it returns the time delta between the file
> > modification and the start of the script. Which makes the use of max() bogus,
> > since it'll return the oldest time any input has been modified, not the
> > newest. And the condition needs to be inverted, because we want to skip the
> > work if $deffile is *newer*, right?
> >
> > Am I missing something here?
>
>
> No, you're right, this is bogus. Reversing the test and using min
> instead of max is the obvious fix.
>
>
> > I'm tempted to just remove the not-regenerating logic - gendef.pl shouldn't
> > run if there's nothing to do, and it'll e.g. not notice if there's an
> > additional input that wasn't there during the last invocation of gendef.pl.
> >
>
> Maybe, need to think about that more.
Any thoughts?
I'd like to commit 0003 in
https://postgr.es/m/20220811002012.ju3rrz47i2e5tdha%40awork3.anarazel.de
fairly soon.
I did fix the bogus "die" message I added during some debugging since posting
that...
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 143+ messages in thread
end of thread, other threads:[~2022-08-21 00:42 UTC | newest]
Thread overview: 143+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 08:37 [RFC] building postgres with meson Andres Freund <andres@anarazel.de>
2021-10-12 09:08 ` Andres Freund <andres@anarazel.de>
2022-03-09 17:13 ` Andres Freund <andres@anarazel.de>
2021-10-12 13:30 ` Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2021-10-12 15:00 ` Robert Haas <robertmhaas@gmail.com>
2021-10-12 15:47 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-12 16:15 ` Andres Freund <andres@anarazel.de>
2021-10-12 19:01 ` Andres Freund <andres@anarazel.de>
2021-10-13 11:54 ` Daniel Gustafsson <daniel@yesql.se>
2022-02-21 16:52 ` Andres Freund <andres@anarazel.de>
2021-10-12 15:08 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:21 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 17:17 ` Andres Freund <andres@anarazel.de>
2021-10-12 23:19 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-12 23:54 ` Andres Freund <andres@anarazel.de>
2021-10-13 21:58 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:14 ` Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 13:19 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 13:29 ` Alvaro Herrera <alvherre@alvh.no-ip.org>
2021-10-14 17:24 ` Andres Freund <andres@anarazel.de>
2021-10-14 19:36 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 22:08 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:38 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:51 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 13:32 ` Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
2021-10-14 19:29 ` Josef Šimánek <josef.simanek@gmail.com>
2021-10-14 17:26 ` Andres Freund <andres@anarazel.de>
2021-10-12 15:28 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 15:50 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 16:59 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:09 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:37 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:16 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:29 ` Andres Freund <andres@anarazel.de>
2021-10-12 20:02 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 20:42 ` Andres Freund <andres@anarazel.de>
2021-10-13 01:03 ` Andres Freund <andres@anarazel.de>
2021-10-13 12:55 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-13 17:26 ` Andres Freund <andres@anarazel.de>
2021-10-13 20:06 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-13 21:46 ` Andres Freund <andres@anarazel.de>
2021-10-13 23:11 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-14 22:19 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-06 17:06 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-06 18:39 ` Andres Freund <andres@anarazel.de>
2022-02-06 20:57 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:00 ` Andrew Dunstan <andrew@dunslane.net>
2022-02-10 17:52 ` Andres Freund <andres@anarazel.de>
2022-02-10 19:06 ` Andrew Dunstan <andrew@dunslane.net>
2022-03-07 13:56 ` Peter Eisentraut <peter.eisentraut@enterprisedb.com>
2022-03-07 17:58 ` Andres Freund <andres@anarazel.de>
2022-03-08 02:57 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:11 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 18:23 ` Andres Freund <andres@anarazel.de>
2021-10-12 18:42 ` Andrew Dunstan <andrew@dunslane.net>
2021-10-12 19:55 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-12 20:59 ` Andres Freund <andres@anarazel.de>
2021-10-13 15:51 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-13 16:37 ` Andres Freund <andres@anarazel.de>
2021-10-13 17:19 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-13 17:42 ` Andres Freund <andres@anarazel.de>
2021-10-13 18:40 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 19:14 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 20:34 ` Andres Freund <andres@anarazel.de>
2021-10-14 20:54 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:16 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-14 21:48 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 21:41 ` Sergey Shinderuk <s.shinderuk@postgrespro.ru>
2021-10-14 22:00 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 22:23 ` Thomas Munro <thomas.munro@gmail.com>
2021-10-14 22:40 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-14 23:04 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 00:36 ` Thomas Munro <thomas.munro@gmail.com>
2021-10-15 02:46 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 03:20 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:15 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:23 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-15 18:50 ` Andres Freund <andres@anarazel.de>
2021-10-15 22:36 ` Andres Freund <andres@anarazel.de>
2021-10-15 22:47 ` Andres Freund <andres@anarazel.de>
2021-10-14 22:55 ` Andres Freund <andres@anarazel.de>
2021-10-14 23:27 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-15 00:02 ` Andres Freund <andres@anarazel.de>
2021-10-14 04:27 ` Thomas Munro <thomas.munro@gmail.com>
2021-10-21 21:48 ` Andres Freund <andres@anarazel.de>
2021-10-22 15:55 ` John Naylor <john.naylor@enterprisedb.com>
2022-03-09 18:47 ` Andres Freund <andres@anarazel.de>
2021-10-19 18:34 ` Andres Freund <andres@anarazel.de>
2021-10-19 19:22 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-19 21:57 ` John Naylor <john.naylor@enterprisedb.com>
2021-10-20 00:31 ` Andres Freund <andres@anarazel.de>
2021-10-20 01:10 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:35 ` Andres Freund <andres@anarazel.de>
2021-10-20 01:08 ` Andres Freund <andres@anarazel.de>
2021-10-20 01:26 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 01:49 ` Andres Freund <andres@anarazel.de>
2021-10-20 02:04 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-10-20 02:41 ` Andres Freund <andres@anarazel.de>
2021-10-20 16:01 ` Andres Freund <andres@anarazel.de>
2021-11-15 18:34 ` Andres Freund <andres@anarazel.de>
2021-11-15 19:11 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 19:23 ` Andres Freund <andres@anarazel.de>
2021-11-15 19:48 ` Robert Haas <robertmhaas@gmail.com>
2021-11-15 22:08 ` Thomas Munro <thomas.munro@gmail.com>
2021-11-15 22:34 ` Tom Lane <tgl@sss.pgh.pa.us>
2021-11-15 22:46 ` Andres Freund <andres@anarazel.de>
2021-11-15 22:52 ` Thomas Munro <thomas.munro@gmail.com>
2021-11-18 20:44 ` Thomas Munro <thomas.munro@gmail.com>
2022-02-09 10:06 ` Joel Jacobson <joel@compiler.org>
2022-03-09 16:55 ` Andres Freund <andres@anarazel.de>
2022-05-26 00:47 ` Andres Freund <andres@anarazel.de>
2022-05-26 01:38 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 02:41 ` Andres Freund <andres@anarazel.de>
2022-05-26 02:58 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-05-26 08:47 ` Aleksander Alekseev <aleksander@timescale.com>
2022-05-28 19:14 ` Andres Freund <andres@anarazel.de>
2022-05-31 13:49 ` Aleksander Alekseev <aleksander@timescale.com>
2022-05-31 19:25 ` Andres Freund <andres@anarazel.de>
2022-06-01 09:39 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-01 21:05 ` Andres Freund <andres@anarazel.de>
2022-06-02 12:34 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-02 15:22 ` Andres Freund <andres@anarazel.de>
2022-06-02 16:39 ` Andres Freund <andres@anarazel.de>
2022-06-02 17:08 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:26 ` Andres Freund <andres@anarazel.de>
2022-06-02 17:33 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 17:48 ` Andres Freund <andres@anarazel.de>
2022-06-02 19:05 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 19:17 ` Andres Freund <andres@anarazel.de>
2022-06-02 19:53 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-06-02 21:13 ` Andres Freund <andres@anarazel.de>
2022-06-03 09:35 ` Aleksander Alekseev <aleksander@timescale.com>
2022-06-03 16:23 ` Andres Freund <andres@anarazel.de>
2022-08-10 17:19 ` Andres Freund <andres@anarazel.de>
2022-08-11 03:33 ` John Naylor <john.naylor@enterprisedb.com>
2022-08-11 03:37 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:45 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-08-11 03:57 ` John Naylor <john.naylor@enterprisedb.com>
2022-08-11 04:07 ` Andres Freund <andres@anarazel.de>
2022-08-11 04:32 ` Tom Lane <tgl@sss.pgh.pa.us>
2022-08-09 07:10 ` Andres Freund <andres@anarazel.de>
2022-08-09 12:37 ` Andrew Dunstan <andrew@dunslane.net>
2022-08-21 00:42 ` Andres Freund <andres@anarazel.de>
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox