Skip to content

ppg:staging:18: custom build of pg_tde with Andy's patch #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rjd15372 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ppg:staging:18: custom build of pg_tde with Andy's patch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions root/ppg/staging/18/percona-pg_tde/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Maintainer: Percona Development Team <info@percona.com>
Build-Depends:
mawk,
meson,
cmake,
ninja-build,
pkg-config,
debhelper (>= 9),
Expand Down
1 change: 1 addition & 0 deletions root/ppg/staging/18/percona-pg_tde/debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Maintainer: Percona Development Team <info@percona.com>
Build-Depends:
mawk,
meson,
cmake,
ninja-build,
pkg-config,
debhelper (>= 9),
Expand Down
1 change: 1 addition & 0 deletions root/ppg/staging/18/percona-pg_tde/debian/debian.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libzstd-dev,
mawk,
meson,
cmake,
ninja-build,
pkg-config,
percona-postgresql-server-dev-all (>= 153~),
Expand Down
26 changes: 26 additions & 0 deletions root/ppg/staging/18/percona-pg_tde/debian/patches/meson-cpp-std-c2a
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Use the pre-ratification spelling "c++2a" of the C++20 standard so that
meson 0.56.2 on Debian 11 accepts the cpp_std value ("c++20" was only
added to meson's cpp_std choices in 0.57). gcc and clang treat -std=c++2a
and -std=c++20 identically, and g++ 10 on bullseye compiles the C++ KMIP
client fine. The libkmip cmake subproject needs no change: cmake itself
emits -std=c++2a for CMAKE_CXX_STANDARD 20 on gcc 10.
--- a/meson.build
+++ b/meson.build
@@ -139,7 +139,7 @@ shared_module('pg_tde',
'src/pg_tde_guc.c',
'src/smgr/pg_tde_smgr.c',
),
- override_options: ['cpp_std=c++20'],
+ override_options: ['cpp_std=c++2a'],
include_directories: incdirs,
install: true,
install_dir: pkglibdir,
@@ -168,7 +168,7 @@ pg_tde_frontend = static_library('pg_tde_frontend',
),
c_args: ['-DFRONTEND'],
cpp_args: ['-DFRONTEND'],
- override_options: ['cpp_std=c++20'],
+ override_options: ['cpp_std=c++2a'],
dependencies: [pgfeutils, pgcommon, pgport, curl, crypto, ssl, kmipclient, kmipcore],
include_directories: incdirs,
)
1 change: 1 addition & 0 deletions root/ppg/staging/18/percona-pg_tde/debian/patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
meson-cpp-std-c2a
7 changes: 3 additions & 4 deletions root/ppg/staging/18/percona-pg_tde/obs/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<services>
<service name="obs_scm">
<param name="url">https://github.com/percona/pg_tde.git</param>
<param name="url">https://github.com/dAdAbird/pg_tde.git</param>
<param name="scm">git</param>
<param name="revision">release-%!{PG_TDE_VERSION}</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">release-(.*)</param>
<param name="revision">arch_logs</param>
<param name="version">2.2.2+1</param>
<param name="submodules">enable</param>
<param name="filename">percona-pg_tde%!{PG_MAJOR_VERSION}</param>
</service>
Expand Down
6 changes: 6 additions & 0 deletions root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ URL: https://github.com/%{sname}/%{sname}/
Source0: %{name}-%{version}.tar.gz

BuildRequires: meson
BuildRequires: cmake
BuildRequires: percona-postgresql%{pgmajorversion}-devel chrpath openssl-devel libcurl-devel zlib-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel
%if 0%{?gts_version}
BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c++ gcc-toolset-%{gts_version}-annobin-plugin-gcc
Expand All @@ -37,6 +38,11 @@ BuildRequires: json-c-devel lz4-devel libzstd-devel numactl-devel
%endif
%if 0%{?suse_version}
BuildRequires: libjson-c-devel liblz4-devel libzstd-devel >= 1.4.0 libnuma-devel
# The C++ KMIP client needs a C++ compiler. Without gcc-c++ in the chroot
# meson falls back to clang++ (pulled in via the llvmjit BuildRequires) while
# C is compiled by gcc; with SUSE's default -flto=auto the mixed toolchain
# produces archives/objects the linker cannot combine.
BuildRequires: gcc-c++
%endif
Requires: postgresql%{pgmajorversion}-server curl openssl

Expand Down
2 changes: 1 addition & 1 deletion root/ppg/staging/18/percona-postgresql/obs/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<service name="obs_scm">
<param name="url">https://github.com/Percona-Lab/postgres.git</param>
<param name="scm">git</param>
<param name="revision">release-%!{PG_VERSION}.1</param>
<param name="revision">release-%!{PG_VERSION}.2</param>
<param name="version">%!{PG_VERSION}</param>
<param name="filename">percona-postgresql</param>
</service>
Expand Down
Loading