From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FF45158094 for ; Wed, 24 Aug 2022 17:07:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 393A3E07E6; Wed, 24 Aug 2022 17:07:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C365EE07E6 for ; Wed, 24 Aug 2022 17:07:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E455340FBA for ; Wed, 24 Aug 2022 17:07:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED259588 for ; Wed, 24 Aug 2022 17:07:33 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1661360788.c588d0c55a2facb7b98331abf3ccb2439cc34286.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-17.2.3-r2.ebuild sys-cluster/ceph/ceph-17.2.3-r3.ebuild sys-cluster/ceph/files/ceph-17.2.3-flags.patch X-VCS-Directories: sys-cluster/ceph/files/ sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: c588d0c55a2facb7b98331abf3ccb2439cc34286 X-VCS-Branch: master Date: Wed, 24 Aug 2022 17:07:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a4028e00-868a-499a-84d3-7fb0272b68b7 X-Archives-Hash: ffa3ea6148e3a0804258b1db1b303573 commit: c588d0c55a2facb7b98331abf3ccb2439cc34286 Author: Patrick McLean gentoo org> AuthorDate: Wed Aug 24 17:06:28 2022 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Aug 24 17:06:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c588d0c5 sys-cluster/ceph: Fix CI bugs 866159, 866161, 866163, 866167 Closes: https://bugs.gentoo.org/866159 Closes: https://bugs.gentoo.org/866161 Closes: https://bugs.gentoo.org/866163 Closes: https://bugs.gentoo.org/866167 Signed-off-by: Patrick McLean gentoo.org> .../{ceph-17.2.3-r2.ebuild => ceph-17.2.3-r3.ebuild} | 9 +++++++++ sys-cluster/ceph/files/ceph-17.2.3-flags.patch | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild similarity index 98% rename from sys-cluster/ceph/ceph-17.2.3-r2.ebuild rename to sys-cluster/ceph/ceph-17.2.3-r3.ebuild index c31770f38434..a604240f1560 100644 --- a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild +++ b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild @@ -219,6 +219,7 @@ PATCHES=( "${FILESDIR}/ceph-17.2.3-gcc12.patch" "${FILESDIR}/ceph-17.2.0-gcc12-dout.patch" "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" + "${FILESDIR}/ceph-17.2.3-flags.patch" ) check-reqs_export_vars() { @@ -330,6 +331,9 @@ ceph_src_configure() { else mycmakeargs+=( -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF + -DWITH_JAEGER:BOOL=OFF + # don't want to warn about unused CLI when reconfiguring for python + -DCMAKE_WARN_UNUSED_CLI:BOOL=OFF ) fi @@ -396,6 +400,7 @@ src_install() { python_setup cmake_src_install + python_optimize find "${ED}" -name '*.la' -type f -delete || die @@ -460,3 +465,7 @@ pkg_postinst() { tmpfiles_process ${PN}.conf udev_reload } + +pkg_postrm() { + udev_reload +} diff --git a/sys-cluster/ceph/files/ceph-17.2.3-flags.patch b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch new file mode 100644 index 000000000000..236ff5441831 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch @@ -0,0 +1,19 @@ +diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake +index 1916363382f..ae460d84542 100644 +--- a/cmake/modules/Distutils.cmake ++++ b/cmake/modules/Distutils.cmake +@@ -94,12 +94,12 @@ function(distutils_add_cython_module target name src) + COMMAND + env + CC="${PY_CC}" +- CFLAGS="${PY_CFLAGS}" ++ CFLAGS="${PY_CFLAGS}"\ ${CMAKE_C_FLAGS} + CPPFLAGS="${PY_CPPFLAGS}" + CXX="${PY_CXX}" + LDSHARED="${PY_LDSHARED}" + OPT=\"-DNDEBUG -g -fwrapv -w\" +- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ++ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS} + CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} + CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + ${Python3_EXECUTABLE} ${setup_py}