sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-04 00:02:37 -04:00
Code Issues Projects Releases Wiki Activity

Stop pretending that we use autotools to build config.h

Browse Source 
We have not been using autotools since commit
e0978a8be6c70b2fccc86ca1cb8fc5499dd83a88 so stop pretending that we do
related to config.h and instead directly have the necessary defines with
the right names in pg_tde.h.
This commit is contained in:
Andreas Karlsson 2025-04-16 11:16:40 +02:00 committed by Andreas Karlsson
parent c10665840e
commit 44c3619f5e
7 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/pg_tde/Makefile
View File

@ -45,7 +45,6 @@ src/catalog/tde_principal_key.o \
src/common/pg_tde_shmem.o \
src/common/pg_tde_utils.o \
src/smgr/pg_tde_smgr.o \
src/pg_tde_defs.o \
src/pg_tde_event_capture.o \
src/pg_tde_guc.o \
src/pg_tde.o \

1
contrib/pg_tde/meson.build
View File

@ -18,7 +18,6 @@ pg_tde_sources = files(
'src/keyring/keyring_kmip_impl.c',
'src/keyring/keyring_vault.c',
'src/pg_tde.c',
'src/pg_tde_defs.c',
'src/pg_tde_event_capture.c',
'src/pg_tde_guc.c',
'src/smgr/pg_tde_smgr.c',

12
contrib/pg_tde/src/include/config.h
View File

@ -1,12 +0,0 @@
#ifndef TDE_CONFIG_H
#define TDE_CONFIG_H
#define PACKAGE_NAME "pg_tde"
#define PACKAGE_VERSION "1.0.0-rc"
#define PACKAGE_STRING PACKAGE_NAME" "PACKAGE_VERSION
#define PACKAGE_TARNAME "pg_tde"
#define PACKAGE_BUGREPORT "https://github.com/percona/pg_tde/issues"
#endif /* TDE_CONFIG_H */

4
contrib/pg_tde/src/include/pg_tde.h
View File

@ -8,6 +8,10 @@
#ifndef PG_TDE_H
#define PG_TDE_H
#define PG_TDE_NAME "pg_tde"
#define PG_TDE_VERSION "1.0.0-rc"
#define PG_TDE_VERSION_STRING PG_TDE_NAME " " PG_TDE_VERSION
#define PG_TDE_DATA_DIR "pg_tde"
typedef struct XLogExtensionInstall

13
contrib/pg_tde/src/include/pg_tde_defs.h
View File

@ -1,13 +0,0 @@
/*-------------------------------------------------------------------------
*
* pg_tde_defs.h
* src/include/pg_tde_defs.h
*
*-------------------------------------------------------------------------
*/
#ifndef PG_TDE_DEFS_H
#define PG_TDE_DEFS_H
extern const char *pg_tde_package_string(void);
#endif /* PG_TDE_DEFS_H */

3
contrib/pg_tde/src/pg_tde.c
View File

@ -32,7 +32,6 @@
#include "keyring/keyring_vault.h"
#include "keyring/keyring_kmip.h"
#include "utils/builtins.h"
#include "pg_tde_defs.h"
#include "smgr/pg_tde_smgr.h"
#include "catalog/tde_global_space.h"
#include "utils/percona.h"
@ -222,7 +221,7 @@ run_extension_install_callbacks(XLogExtensionInstall *xlrec, bool redo)
Datum
pg_tde_version(PG_FUNCTION_ARGS)
{
PG_RETURN_TEXT_P(cstring_to_text(pg_tde_package_string()));
PG_RETURN_TEXT_P(cstring_to_text(PG_TDE_VERSION_STRING));
}
Datum

25
contrib/pg_tde/src/pg_tde_defs.c
View File

@ -1,25 +0,0 @@
/*-------------------------------------------------------------------------
*
* pg_tde_defs.c
* The configure script generates config.h which contains the package_* defs
* and these defines conflicts with the PG defines.
* This file is used to provide the package version string to the extension
* without including the config.h file.
*
* IDENTIFICATION
* contrib/pg_tde/src/pg_tde_defs.c
*
*-------------------------------------------------------------------------
*/
#include "config.h"
#include "pg_tde_defs.h"
/* Returns package version */
const char *
pg_tde_package_string(void)
{
return PACKAGE_STRING;
}