Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions root/ppg/devel/19/percona-pg_stat_monitor/debian/debian.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Maintainer: Percona Development Team <info@percona.com>
Build-Depends:
debhelper (>= 9),
mawk,
libkrb5-dev,
libssl-dev,
percona-postgresql-server-dev-all (>= 153~),
Debtransform-Release: 1
Debtransform-Files-Tar: debian.tar.gz
3 changes: 3 additions & 0 deletions root/ppg/devel/19/percona-pg_stat_monitor/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ override_dh_builddeb:

override_dh_auto_build:
+pg_buildext clean . build-%v
# Sources on git main live under src/; pg_buildext's out-of-tree build
# does not create output subdirectories, so -o src/*.o fails without this.
mkdir -p build-%!{PG_MAJOR_VERSION}/src
+pg_buildext build . build-%v

override_dh_auto_test:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ USE_PGXS=1 PATH=%{pginstdir}/bin:$PATH %{__make} %{?_smp_mflags} install DESTDIR
%{pginstdir}/share/extension/pg_stat_monitor.control
%{pginstdir}/lib/bitcode/pg_stat_monitor*.bc
%dir %{pginstdir}/lib/bitcode/pg_stat_monitor
%{pginstdir}/lib/bitcode/pg_stat_monitor/*.bc
%dir %{pginstdir}/lib/bitcode/pg_stat_monitor/src
%{pginstdir}/lib/bitcode/pg_stat_monitor/src/*.bc


%changelog
Expand Down
1 change: 1 addition & 0 deletions root/ppg/devel/19/percona-pg_tde/debian/control
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/devel/19/percona-pg_tde/debian/control.in
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/devel/19/percona-pg_tde/debian/debian.dsc
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/devel/19/percona-pg_tde/debian/patches/meson-cpp-std-c2a
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/devel/19/percona-pg_tde/debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
meson-cpp-std-c2a
6 changes: 3 additions & 3 deletions root/ppg/devel/19/percona-pg_tde/obs/_service
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<services>
<service name="obs_scm">
<param name="url">https://github.com/jeltz/pg_tde.git</param>
<param name="url">https://github.com/percona/pg_tde.git</param>
<param name="scm">git</param>
<param name="revision">pg19</param>
<param name="version">2.2.2.dev</param>
<param name="revision">main</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</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/devel/19/percona-pg_tde/rpm/pg_tde.spec
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
BuildRequires: percona-postgresql%{pgmajorversion}-static
%if 0%{?gts_version}
Expand All @@ -38,6 +39,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
1 change: 1 addition & 0 deletions root/ppg/devel/19/percona-pgbackrest/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Build-Depends: mawk,
perl,
pkgconf,
python3 (>= 3.10) | python3-distutils,
python3-yaml,
txt2man,
zlib1g-dev
Standards-Version: 4.7.2
Expand Down
1 change: 1 addition & 0 deletions root/ppg/devel/19/percona-pgbackrest/debian/debian.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Build-Depends:
perl,
pkgconf,
python3,
python3-yaml,
txt2man,
Debtransform-Release: 1
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion root/ppg/devel/19/percona-pgbackrest/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ override_dh_auto_build:
# doc/resource/exe.cache; upstream only refreshes the cache at release
# time, so on main the cache keys go stale (--cache-only forbids a
# reset). Exclude it like backlog.
perl $(CURDIR)/doc/doc.pl --out=man --out=html --cache-only \
python3 $(CURDIR)/doc/doc.py --out=man --out=html --cache-only \
--var=project-url-root=index.html --exclude=backlog \
--exclude=user-guide
txt2man \
Expand Down
6 changes: 6 additions & 0 deletions root/ppg/devel/19/percona-pgbackrest/rpm/pgbackrest.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ Source3: pgbackrest.logrotate
Source4: pgbackrest.service
BuildRequires: gcc openssl-devel zlib-devel percona-postgresql%{pgmajorversion}-devel
BuildRequires: libzstd-devel libxml2-devel libyaml-devel meson
%if !0%{?suse_version}
BuildRequires: python3-pyyaml
%endif
%if 0%{?suse_version} >= 1500
BuildRequires: python3-PyYAML
%endif
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 42
BuildRequires: libssh2-devel
%endif
Expand Down
2 changes: 1 addition & 1 deletion root/ppg/devel/19/percona-postgis/rpm/percona-postgis.spec
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ fi
%if %utils
%files utils
%defattr(-,root,root)
%doc utils/README
%doc utils/README.md
%dir %{_datadir}/%{name}
%attr(755,root,root) %{_datadir}/%{name}/*.pl
%endif
Expand Down
6 changes: 3 additions & 3 deletions root/ppg/devel/19/percona-postgresql/obs/_service
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<param name="url">https://github.com/percona/postgres.git</param>
<param name="scm">git</param>
<param name="revision">PSP_REL_%!{PG_MAJOR_VERSION}_STABLE</param>
<param name="version">%!{PG_MAJOR_VERSION}.beta1</param>
<param name="version">%!{PG_MAJOR_VERSION}.beta3</param>
<param name="filename">percona-postgresql</param>
</service>
<service mode="buildtime" name="tar" />
Expand All @@ -12,10 +12,10 @@
<param name="compression">gz</param>
</service>
<service mode="buildtime" name="set_version">
<param name="version">3:%!{PG_MAJOR_VERSION}.beta1</param>
<param name="version">3:%!{PG_MAJOR_VERSION}.beta3</param>
</service>
<service mode="buildtime" name="set_version">
<param name="version">%!{PG_MAJOR_VERSION}.beta1</param>
<param name="version">%!{PG_MAJOR_VERSION}.beta3</param>
<param name="file">percona-postgresql.spec</param>
</service>
</services>
Loading