From 453ff2900dcca6211dad4bb938a33a5b503e6994 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 24 Sep 2025 11:52:04 +0200 Subject: [PATCH 1/4] PG-1879 Indent multiline assignments in Makefile Also move the first item to a separate line. This improves readability of the Makefile while also making it more like PG's own makefiles. --- contrib/pg_tde/Makefile | 110 +++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index 91154698667dc..833e4cb0cc57d 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -6,65 +6,69 @@ DATA = pg_tde--1.0--2.0.sql pg_tde--1.0.sql # Since meson supports skipping test suites this is a make only feature ifndef TDE_MODE REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_tde/pg_tde.conf -REGRESS = access_control \ -alter_index \ -cache_alloc \ -change_access_method \ -create_database \ -default_principal_key \ -delete_principal_key \ -insert_update_delete \ -key_provider \ -kmip_test \ -partition_table \ -pg_tde_is_encrypted \ -recreate_storage \ -relocate \ -tablespace \ -toast_decrypt \ -vault_v2_test \ -version +REGRESS = \ + access_control \ + alter_index \ + cache_alloc \ + change_access_method \ + create_database \ + default_principal_key \ + delete_principal_key \ + insert_update_delete \ + key_provider \ + kmip_test \ + partition_table \ + pg_tde_is_encrypted \ + recreate_storage \ + relocate \ + tablespace \ + toast_decrypt \ + vault_v2_test \ + version TAP_TESTS = 1 endif KMIP_OBJS = \ -src/libkmip/libkmip/src/kmip.o \ -src/libkmip/libkmip/src/kmip_bio.o \ -src/libkmip/libkmip/src/kmip_locate.o \ -src/libkmip/libkmip/src/kmip_memset.o - -OBJS = src/encryption/enc_tde.o \ -src/encryption/enc_aes.o \ -src/access/pg_tde_tdemap.o \ -src/access/pg_tde_xlog.o \ -src/access/pg_tde_xlog_keys.o \ -src/access/pg_tde_xlog_smgr.o \ -src/keyring/keyring_curl.o \ -src/keyring/keyring_file.o \ -src/keyring/keyring_vault.o \ -src/keyring/keyring_kmip.o \ -src/keyring/keyring_kmip_impl.o \ -src/keyring/keyring_api.o \ -src/catalog/tde_keyring.o \ -src/catalog/tde_keyring_parse_opts.o \ -src/catalog/tde_principal_key.o \ -src/common/pg_tde_utils.o \ -src/smgr/pg_tde_smgr.o \ -src/pg_tde_event_capture.o \ -src/pg_tde_guc.o \ -src/pg_tde.o \ -$(KMIP_OBJS) - -SCRIPTS_built = src/bin/pg_tde_archive_decrypt \ -src/bin/pg_tde_change_key_provider \ -src/bin/pg_tde_restore_encrypt + src/libkmip/libkmip/src/kmip.o \ + src/libkmip/libkmip/src/kmip_bio.o \ + src/libkmip/libkmip/src/kmip_locate.o \ + src/libkmip/libkmip/src/kmip_memset.o + +OBJS = \ + src/encryption/enc_tde.o \ + src/encryption/enc_aes.o \ + src/access/pg_tde_tdemap.o \ + src/access/pg_tde_xlog.o \ + src/access/pg_tde_xlog_keys.o \ + src/access/pg_tde_xlog_smgr.o \ + src/keyring/keyring_curl.o \ + src/keyring/keyring_file.o \ + src/keyring/keyring_vault.o \ + src/keyring/keyring_kmip.o \ + src/keyring/keyring_kmip_impl.o \ + src/keyring/keyring_api.o \ + src/catalog/tde_keyring.o \ + src/catalog/tde_keyring_parse_opts.o \ + src/catalog/tde_principal_key.o \ + src/common/pg_tde_utils.o \ + src/smgr/pg_tde_smgr.o \ + src/pg_tde_event_capture.o \ + src/pg_tde_guc.o \ + src/pg_tde.o \ + $(KMIP_OBJS) + +SCRIPTS_built = \ + src/bin/pg_tde_archive_decrypt \ + src/bin/pg_tde_change_key_provider \ + src/bin/pg_tde_restore_encrypt EXTRA_INSTALL = contrib/pg_buffercache contrib/test_decoding -EXTRA_CLEAN = src/bin/pg_tde_archive_decrypt.o \ -src/bin/pg_tde_change_key_provider.o \ -src/bin/pg_tde_restore_encrypt.o \ -xlogreader.c \ -xlogreader.o +EXTRA_CLEAN = \ + src/bin/pg_tde_archive_decrypt.o \ + src/bin/pg_tde_change_key_provider.o \ + src/bin/pg_tde_restore_encrypt.o \ + xlogreader.c \ + xlogreader.o ifdef USE_PGXS PG_CONFIG = pg_config From 41848dc430f7a1b11d5dce1bd8e6bbafc3544332 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 24 Sep 2025 11:53:35 +0200 Subject: [PATCH 2/4] PG-1879 Remove unnecessary quotes in Makefile --- contrib/pg_tde/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index 833e4cb0cc57d..21e85bebfc4fa 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -87,7 +87,7 @@ SHLIB_LINK = -lcurl -lcrypto -lssl LDFLAGS_EX = -L$(top_builddir)/src/fe_utils PG_LIBS = -lcurl -lcrypto -lssl -lpgfeutils -$(KMIP_OBJS): CFLAGS += '-w' # This is a 3rd party, disable warnings completely +$(KMIP_OBJS): CFLAGS += -w # This is a 3rd party, disable warnings completely src/bin/pg_tde_change_key_provider: src/bin/pg_tde_change_key_provider.o $(top_builddir)/src/libtde/libtde.a | submake-libpgfeutils $(CC) $(CFLAGS) $^ $(PG_LIBS_INTERNAL) $(LDFLAGS) $(LDFLAGS_EX) $(PG_LIBS) $(LIBS) -o $@$(X) From 7b8bc4ca18f69d314c0522af019d95b8a2fa5178 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 24 Sep 2025 11:54:35 +0200 Subject: [PATCH 3/4] PG-1879 Just add extra CLFAG when building xlogreader.c Writing the whole compiler command from scratch only makes it more risky that we miss something. --- contrib/pg_tde/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index 21e85bebfc4fa..c5ed1f7a268ba 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -101,8 +101,7 @@ src/bin/pg_tde_restore_encrypt: src/bin/pg_tde_restore_encrypt.o xlogreader.o $( xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/% rm -f $@ && $(LN_S) $< . -xlogreader.o: xlogreader.c - $(CC) $(CPPFLAGS) -DFRONTEND -c $< -o $@ +xlogreader.o: CFLAGS += -DFRONTEND # Fetches typedefs list for PostgreSQL core and merges it with typedefs defined in this project. # https://wiki.postgresql.org/wiki/Running_pgindent_on_non-core_code_or_development_code From 09aa72bbf928d37869fc9a7e192e7487edb828da Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 24 Sep 2025 11:55:33 +0200 Subject: [PATCH 4/4] PG-1879 Use only LDFLAGS_EX in Makefile Using many different variables only makes things more confusing and when we start needing to use $(libpq_pgport) this will be cleaner anyway. --- contrib/pg_tde/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index c5ed1f7a268ba..97832b46a4e44 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -84,8 +84,7 @@ include $(top_srcdir)/contrib/contrib-global.mk endif SHLIB_LINK = -lcurl -lcrypto -lssl -LDFLAGS_EX = -L$(top_builddir)/src/fe_utils -PG_LIBS = -lcurl -lcrypto -lssl -lpgfeutils +LDFLAGS_EX = -L$(top_builddir)/src/fe_utils -lcurl -lcrypto -lssl -lpgfeutils $(KMIP_OBJS): CFLAGS += -w # This is a 3rd party, disable warnings completely