Compare commits

...

3 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY 3c5598efe8 rebuild with libarrow-23.0.1, cmake-4-isms, lua-5.5 2026-02-17 12:52:35 -05:00
Kaleb S. KEITHLEY 8fa2f6e626 cmake-4-isms, use system zstd 2026-02-17 09:26:54 -05:00
Kaleb S. KEITHLEY 3a3173ee12 again 2026-02-16 19:59:06 -05:00
4 changed files with 41 additions and 1 deletions
+11
View File
@@ -9,3 +9,14 @@
#endif
// -----------------------------------------------------------------------------
--- ceph-20.2.0/src/boost/boost/redis/adapter/detail/adapters.hpp.orig 2026-02-06 09:54:39.748078321 -0500
+++ ceph-20.2.0/src/boost/boost/redis/adapter/detail/adapters.hpp 2026-02-06 09:55:02.427664048 -0500
@@ -29,7 +29,7 @@
#include <charconv>
// See https://stackoverflow.com/a/31658120/1077832
-#include<ciso646>
+#include<iso646.h>
#ifdef _LIBCPP_VERSION
#else
#include <cstdlib>
@@ -0,0 +1,8 @@
--- ceph-20.2.0/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt.orig 2026-02-17 08:17:06.372917033 -0500
+++ ceph-20.2.0/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt 2026-02-17 08:17:44.026323618 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
# See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html required by certain
# versions of gtest
+14
View File
@@ -0,0 +1,14 @@
--- ceph-20.2.0/src/rgw/rgw_lua_utils.cc.orig 2026-02-17 11:46:05.677894827 -0500
+++ ceph-20.2.0/src/rgw/rgw_lua_utils.cc 2026-02-17 11:50:06.106569226 -0500
@@ -115,7 +115,11 @@
// create new lua state together with reference to the guard
lua_State* newstate(lua_state_guard* guard) {
+#if (LUA_VERSION_NUM < 505)
lua_State* L = lua_newstate(allocator, guard);
+#else
+ lua_State* L = lua_newstate(allocator, guard, 314159);
+#endif
if (L) {
lua_atpanic(L, [](lua_State* L) -> int {
const char* msg = lua_tostring(L, -1);
+8 -1
View File
@@ -180,7 +180,7 @@
#################################################################################
Name: ceph
Version: 20.2.0
Release: 8%{?dist}
Release: 9%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -221,6 +221,8 @@ Patch: 0058-src-CMakeLists.txt.patch
Patch: 0059-iso646.patch
Patch: 0061-gcc-16.patch
Patch: 0062-src-rgw-driver-dbstore-CMakeLists.txt.patch
Patch: 0063-src-jaegertracing-opentelemetry-cpp-CMakeLists.txt.patch
Patch: 0064-src-rgw-rgw_lua_utils.cc.patch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl
@@ -255,6 +257,7 @@ BuildRequires: cmake > 3.5
BuildRequires: fuse3-devel
BuildRequires: grpc-devel
BuildRequires: gcc-c++
BuildRequires: libzstd-devel
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: libatomic
%endif
@@ -1466,6 +1469,7 @@ env | sort
%if 0%{with ocf}
-DWITH_OCF:BOOL=ON \
%endif
-DWITH_SYSTEM_ZSTD:BOOL=ON \
%if 0%{?fedora} || 0%{?rhel} >= 10
-DWITH_SYSTEM_ROCKSDB:BOOL=OFF \
%endif
@@ -2740,6 +2744,9 @@ exit 0
%{python3_sitelib}/ceph_node_proxy-*
%changelog
* Tue Feb 17 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-9
- ceph-20.2.0, rebuild with libarrow-23.0.1, cmake-4-isms, lua-5.5
* Wed Jan 28 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-8
- ceph-20.2.0, rebuild with libarrow-23.0.0, side tag f44-build-side-127546