Accepting request 1323483 from server:database:postgresql

OBS-URL: https://build.opensuse.org/request/show/1323483
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql18?expand=0&rev=3

llvm-21-aarch64.patch

@@ -0,0 +1,41 @@
+From 0dceba21d74f01e63aa690879b44808bbb74a9c3 Mon Sep 17 00:00:00 2001
+From: Thomas Munro <tmunro@postgresql.org>
+Date: Sat, 22 Nov 2025 20:51:16 +1300
+Subject: [PATCH] jit: Adjust AArch64-only code for LLVM 21.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+LLVM 21 changed the arguments of RTDyldObjectLinkingLayer's
+constructor, breaking compilation with the backported
+SectionMemoryManager from commit 9044fc1d.
+
+https://github.com/llvm/llvm-project/commit/cd585864c0bbbd74ed2a2b1ccc191eed4d1c8f90
+
+Backpatch-through: 14
+Author: Holger Hoffstätte <holger@applied-asynchrony.com>
+Reviewed-by: Anthonin Bonnefoy <anthonin.bonnefoy@datadoghq.com>
+Discussion: https://postgr.es/m/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com
+---
+ src/backend/jit/llvm/llvmjit_wrap.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp
+index da850d67ab647..c31a57b8563e8 100644
+--- a/src/backend/jit/llvm/llvmjit_wrap.cpp
++++ b/src/backend/jit/llvm/llvmjit_wrap.cpp
+@@ -53,7 +53,14 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(llvm::orc::ObjectLayer, LLVMOrcObjectLayerRef
+ LLVMOrcObjectLayerRef
+ LLVMOrcCreateRTDyldObjectLinkingLayerWithSafeSectionMemoryManager(LLVMOrcExecutionSessionRef ES)
+ {
++#if LLVM_VERSION_MAJOR >= 21
++	return wrap(new llvm::orc::RTDyldObjectLinkingLayer(
++		*unwrap(ES), [](const llvm::MemoryBuffer&) {
++			return std::make_unique<llvm::backport::SectionMemoryManager>(nullptr, true);
++		}));
++#else
+ 	return wrap(new llvm::orc::RTDyldObjectLinkingLayer(
+ 		*unwrap(ES), [] { return std::make_unique<llvm::backport::SectionMemoryManager>(nullptr, true); }));
++#endif
+ }
+ #endif

postgresql18.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  9 08:23:44 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix build on aarch64 with upstream commit 0dceba2:
+ * llvm-21-aarch64.patch
+
 -------------------------------------------------------------------
 Mon Nov 24 16:22:39 UTC 2025 - Reinhard Max <max@suse.com>
 

postgresql18.spec

@@ -155,8 +155,8 @@ BuildRequires:  libicu-devel
 BuildRequires:  libselinux-devel
 %endif
 %if %{with llvm}
-BuildRequires:  gcc-c++
 BuildRequires:  clang%{product_libs_llvm_ver}
+BuildRequires:  gcc-c++
 BuildRequires:  llvm%{product_libs_llvm_ver}-devel
 %endif
 BuildRequires:  libxslt-devel
@@ -218,6 +218,8 @@ Patch9:         postgresql-var-run-socket.patch
 %if %{with llvm}
 Patch10:        postgresql-llvm-optional.patch
 Patch11:        0001-jit-Workaround-potential-datalayout-mismatch-on-s390.patch
+# PATCH-FIX-UPSTREAM - commit 0dceba2
+Patch12:        llvm-21-aarch64.patch
 %endif
 URL:            https://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -550,6 +552,7 @@ touch -r configure tmp
 %if %{with llvm}
 %patch -P 10
 %patch -P 11
+%patch -P 12 -p1
 %endif
 touch -r tmp configure
 rm tmp