From 9ef24a2384c37fea807a7e83b9e1d398ba3242b0 Mon Sep 17 00:00:00 2001 From: psykose Date: Thu, 11 Aug 2022 23:56:46 +0000 Subject: testing/ceph17: fix build with gcc12 --- testing/ceph17/APKBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testing/ceph17/APKBUILD b/testing/ceph17/APKBUILD index 201393a9290..b13ff627933 100644 --- a/testing/ceph17/APKBUILD +++ b/testing/ceph17/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Duncan Bellamy _pkgname=ceph pkgver=17.2.3 -pkgrel=2 +pkgrel=3 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgdesc="Ceph is a distributed object store and file system, version $_majorver" @@ -131,6 +131,8 @@ source="https://download.ceph.com/tarballs/ceph-$pkgver.tar.gz 40-nasm.patch 45-python.patch 46-statx.patch + $pkgname-gcc12.patch::https://github.com/ceph/ceph/commit/963d756ded40f5adf2efef53893c917bec1845c1.patch + $pkgname-gcc12-memory.patch::https://github.com/ceph/ceph/commit/7c381ba985bd1398ef7d145cc00fae9d0db510e3.patch " # to prevent things from installing ceph17 libs, since they have the same SOMAJOR sonameprefix="ceph$_majorver:so:" @@ -647,4 +649,6 @@ abb3cab9c01cc3d6d42a9858678059a8c9c43bda2649bf97b489fdc205eb10ae27f9fb7302062e0f 00f579eb9417cfc6fc99b5347febd5ae299004d47dd2fa389509bb2bdcb406f89c5cc0d2164ac2ad800f10129e89a56c794cd62c12d410de12ba6a664316e0a3 40-nasm.patch f49427d3420574043e18cad517a6f81ee38a48b827195f564fd728fd2f2b32dbf17f9e21842b01bbf3ab40875c70b0db316a478b8cc48dd92c839d2ce5e7fd63 45-python.patch f589c85baca2654e54ebd986ddda70a9b38116332c7c10aa5b75cd8a9c37e8d157baf0ad9ac91e36750046e7554d6831d93cb16d3967b5986155b8f38cff66c5 46-statx.patch +e54ee5223831b23676f4de7a49fc2548e5deb524ecc0e75a6d4dac1c5e69e9f8fb9bb5fd2e423dd548ad7dd7e3d6c7b4a0e9e68ceaabfa1add8f025687bd4e60 ceph17-gcc12.patch +f1b54767d8d3c12ca9fe9eafd0590efa8560a52b5c18f1121f8fd8b7e69d70578bdeae9a1803612a8a8d0032f039f8786b5152a889ba359850e3d3d30a6af8c7 ceph17-gcc12-memory.patch " -- cgit v1.2.3