mirror of https://github.com/postgres/postgres
Remove maketools and fix frontend tools tde data usage (#362)
This commit: 1. Removes autoconf builds for pg_tde so it can be together built with Postgres (now, used would have to go to contrib/pg_tde and build it explicitly after building Postgres) with make. There are still left pg_tde builds in CI tests since this PR depends on https://github.com/percona/postgres/pull/20. So those leftover will be removed after merging PG PR 2. Adds necessary changes regarding new code (like kmip) so frontend tools (pg_waldump et al) can be compiled with pg_tde 2. Get rid of realpath as it has issues with optimised builds For: PG-1003, PG-1005pull/209/head
Andrew Pogrebnoi
10 months ago
committed by
GitHub
parent
86f7995e5a
commit
e0978a8be6
@ -0,0 +1,20 @@ |
|||||||
|
TDE_OBJS = \
|
||||||
|
src/access/pg_tde_tdemap.o \
|
||||||
|
src/access/pg_tde_xlog_encrypt.o \
|
||||||
|
src/catalog/tde_global_space.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/encryption/enc_aes.o \
|
||||||
|
src/encryption/enc_tde.o \
|
||||||
|
src/keyring/keyring_api.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_ereport.o \
|
||||||
|
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
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,63 +0,0 @@ |
|||||||
# Process this file with autoconf to produce a configure script. |
|
||||||
# configure.ac |
|
||||||
|
|
||||||
AC_INIT([pg_tde], [1.0.0-beta2], [https://github.com/percona/pg_tde/issues], [pg_tde]) |
|
||||||
|
|
||||||
AC_CANONICAL_HOST |
|
||||||
|
|
||||||
# REQUIRE_LIB(name,lib,package,testfn,test_header_dir,test_include.h) |
|
||||||
# name = The complete name of the library file without the extension. |
|
||||||
# lib = The name of the library file without the 'lib' prefix and without the extension. |
|
||||||
# package = The name of the package that holds the library |
|
||||||
# testfn = One function included in the library that can be used for a test compilation. |
|
||||||
# headerdir = The directory that contains required header. |
|
||||||
# header = The header file to check for |
|
||||||
# if there's a problem during the test compilation. |
|
||||||
AC_DEFUN([REQUIRE_LIB], [ { |
|
||||||
AC_ARG_WITH([$1], AS_HELP_STRING([--with-$1=<path>],[Location where $6 is installed]),[],[with_$1=default]) |
|
||||||
AS_IF([test "x$with_$1" == xdefault], |
|
||||||
[ |
|
||||||
case $host_os in |
|
||||||
darwin*) libpathx=($(brew --cellar)/$3/*) |
|
||||||
tde_CPPFLAGS="$tde_CPPFLAGS -I$libpathx/include/$5" |
|
||||||
tde_LDFLAGS="$tde_LDFLAGS -L$libpathx/lib -l$2" ;; |
|
||||||
*) tde_CPPFLAGS="$tde_CPPFLAGS -I/usr/include/$5" |
|
||||||
tde_LDFLAGS="$tde_LDFLAGS -l$2" ;; |
|
||||||
esac |
|
||||||
], [ #AS_ELSE |
|
||||||
tde_CPPFLAGS="$tde_CPPFLAGS -I${with_$1}/include" |
|
||||||
tde_LDFLAGS="$tde_LDFLAGS -L${with_$1}/lib -l$2" |
|
||||||
]) |
|
||||||
LDFLAGS="$LDFLAGS $tde_LDFLAGS" |
|
||||||
CPPFLAGS="$CPPFLAGS $tde_CPPFLAGS" |
|
||||||
|
|
||||||
AC_CHECK_HEADER($6, [], |
|
||||||
[ |
|
||||||
AC_MSG_ERROR([header file <$6> is required, try specifying --with-$1]) |
|
||||||
]) |
|
||||||
|
|
||||||
|
|
||||||
AC_CHECK_LIB($2, $4, [], |
|
||||||
[ |
|
||||||
AC_MSG_ERROR([$1 was not found, try specifying --with-$1]) |
|
||||||
]) |
|
||||||
} ] ) |
|
||||||
|
|
||||||
AC_CONFIG_HEADERS(src/include/config.h) |
|
||||||
|
|
||||||
#======================================= |
|
||||||
|
|
||||||
REQUIRE_LIB(libcurl, curl, curl, curl_easy_setopt, curl, curl/curl.h) |
|
||||||
|
|
||||||
case $host_os in |
|
||||||
# on other systems libintl is a part of glibc |
|
||||||
darwin*) REQUIRE_LIB(libintl, intl, gettext, ngettext, [], libintl.h) |
|
||||||
esac |
|
||||||
|
|
||||||
|
|
||||||
AC_SUBST(tde_CPPFLAGS) |
|
||||||
AC_SUBST(tde_LDFLAGS) |
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile]) |
|
||||||
|
|
||||||
AC_OUTPUT |
|
||||||
@ -0,0 +1,12 @@ |
|||||||
|
#ifndef TDE_CONFIG_H |
||||||
|
#define TDE_CONFIG_H |
||||||
|
|
||||||
|
#define PACKAGE_NAME "pg_tde" |
||||||
|
#define PACKAGE_VERSION "1.0.0-beta2" |
||||||
|
|
||||||
|
#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 */ |
||||||
@ -1,57 +0,0 @@ |
|||||||
/* src/include/config.h.in. Generated from configure.ac by autoheader. */ |
|
||||||
|
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */ |
|
||||||
#undef HAVE_INTTYPES_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the `curl' library (-lcurl). */ |
|
||||||
#undef HAVE_LIBCURL |
|
||||||
|
|
||||||
/* Define to 1 if you have the `intl' library (-lintl). */ |
|
||||||
#undef HAVE_LIBINTL |
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */ |
|
||||||
#undef HAVE_STDINT_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdio.h> header file. */ |
|
||||||
#undef HAVE_STDIO_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdlib.h> header file. */ |
|
||||||
#undef HAVE_STDLIB_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <strings.h> header file. */ |
|
||||||
#undef HAVE_STRINGS_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <string.h> header file. */ |
|
||||||
#undef HAVE_STRING_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/stat.h> header file. */ |
|
||||||
#undef HAVE_SYS_STAT_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/types.h> header file. */ |
|
||||||
#undef HAVE_SYS_TYPES_H |
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> header file. */ |
|
||||||
#undef HAVE_UNISTD_H |
|
||||||
|
|
||||||
/* Define to the address where bug reports for this package should be sent. */ |
|
||||||
#undef PACKAGE_BUGREPORT |
|
||||||
|
|
||||||
/* Define to the full name of this package. */ |
|
||||||
#undef PACKAGE_NAME |
|
||||||
|
|
||||||
/* Define to the full name and version of this package. */ |
|
||||||
#undef PACKAGE_STRING |
|
||||||
|
|
||||||
/* Define to the one symbol short name of this package. */ |
|
||||||
#undef PACKAGE_TARNAME |
|
||||||
|
|
||||||
/* Define to the home page for this package. */ |
|
||||||
#undef PACKAGE_URL |
|
||||||
|
|
||||||
/* Define to the version of this package. */ |
|
||||||
#undef PACKAGE_VERSION |
|
||||||
|
|
||||||
/* Define to 1 if all of the C90 standard headers exist (not just the ones
|
|
||||||
required in a freestanding environment). This macro is provided for |
|
||||||
backward compatibility; new code need not use it. */ |
|
||||||
#undef STDC_HEADERS |
|
||||||
Loading…
Reference in new issue