From 87f37a073fb5c2e1f6ebc780e60cdbdd2c583860 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Feb 2023 04:02:51 +0000 Subject: gentoo auto-resync : 28:02:2023 - 04:02:51 --- sys-libs/libnvme/Manifest | 3 +- .../files/libnvme-1.3-configure-clang-16.patch | 32 +++++++++ sys-libs/libnvme/libnvme-1.3-r1.ebuild | 75 ++++++++++++++++++++++ sys-libs/libnvme/libnvme-1.3.ebuild | 71 -------------------- 4 files changed, 109 insertions(+), 72 deletions(-) create mode 100644 sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch create mode 100644 sys-libs/libnvme/libnvme-1.3-r1.ebuild delete mode 100644 sys-libs/libnvme/libnvme-1.3.ebuild (limited to 'sys-libs/libnvme') diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest index f54629271ae1..288f8fd2fafb 100644 --- a/sys-libs/libnvme/Manifest +++ b/sys-libs/libnvme/Manifest @@ -1,5 +1,6 @@ +AUX libnvme-1.3-configure-clang-16.patch 1332 BLAKE2B 701a941236c5fd644722086d58d7b5ce15d81f8cdc17ea4d2cb79efd743acf54990da83c81c8a8ef74822b3d1e51e70eb02a4a25a07a74404a307d564f56dc37 SHA512 a100ab3232b0a1bee74dbe0d4893d3819c4e3f4b741da740240431cabf72c4ccb411fca6a19f44ecf5e64bdbfd2f470b4c436c57b1a573dfea14e575a3dbd44f DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772f89faab1659811d860036f8af89bbcb383db37e96b763188935d2c1ecaa5176b8140bba50f8ea226e989a06 SHA512 f50517838cd1df3cdd123afdb67870633e9e484bf84dba70b784d7e86ecb355b96ba9d6a1cffb96b35444da7870dfe21c54b69701b5fe5b515319280db4a84e4 DIST libnvme-1.3.tar.gz 499870 BLAKE2B 5a019c12829890a0fe0b5e6aec5fbd009fc3bd6dfe7e81f61731292f4ea8b03044e7625491479350c399cc8cd5bc023e02cc9e93f1eba38f4c747667e84cfb24 SHA512 c874b29b73e55be842f71e74a226a76fcd50dfa72e2be100f0437bc83e740cd146b6d2f2cdaa940c11c3d8c48ff2c065ac0e8a83d4d0dde743edf4179f328670 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971 -EBUILD libnvme-1.3.ebuild 1297 BLAKE2B 132ff3046fceadf990f06b9f2ea436305a2d67ceaa2dabcfe21a123c492a75992d520a093b678beafa84588c4879f58f00ee2e343c6dec24c11f1b98e585ca0c SHA512 bc8efc3097489df37a30c4b20a5d8eaaad0aa07e85134d846f690a6046c7b2ada230acfd8ecdef11426292650f0306ed5875424ef4b385ac608b01966dc9ccf7 +EBUILD libnvme-1.3-r1.ebuild 1355 BLAKE2B 75d8ad6027f6f491b7e488c6814a15689d987faee3e9aab76f2809356e33ef0946faf36a8e97561f8479e29fac974d8f8086d95b6cd5511c5162a487f723ceca SHA512 4c4d3edf0bff68516f32b14af4197e137fde15b344d88a88a8bf8c51171a8dab2cdc40f1c1f65007ba64ae484b213b90fa94fdcb66b3a6753c7b78be15813d85 MISC metadata.xml 509 BLAKE2B b128b0b3ca70400e116d80d860fdff08e664786346fae94bba179d366b4ef74e078f1ecfdf3dbcc00500c2d0f614a68f2fc1282eba18011ad18cdf7b1710f6a4 SHA512 bd2555619a141e44fff2aa101d7adbf0c52543dd9034149dd3b05210542bc329aa957326f42b6695d65140c19e3b791176b8b7428252ec127a0b938c790bfbd3 diff --git a/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch b/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch new file mode 100644 index 000000000000..b7954a996272 --- /dev/null +++ b/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch @@ -0,0 +1,32 @@ +https://github.com/linux-nvme/libnvme/commit/ddfb3ba036f9df2737c165b27f9b458dd83a7df8 + +From ddfb3ba036f9df2737c165b27f9b458dd83a7df8 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Tue, 31 Jan 2023 23:27:53 +0100 +Subject: [PATCH] build: Fix nss code snippet includes + +With hardened distribution CFLAGS the meson code snippet wouldn't compile: + +Compiler stderr: + .build/meson-private/tmpy2z1t5q4/testfile.c: In function 'main': + .build/meson-private/tmpy2z1t5q4/testfile.c:2:30: error: storage size of 'hints' isn't known + 2 | struct addrinfo hints, *result; + | ^~~~~ + .build/meson-private/tmpy2z1t5q4/testfile.c:3:21: warning: implicit declaration of function 'getaddrinfo' [-Wimplicit-function-declaration] + 3 | return getaddrinfo(argv[1], argv[2], &hints, &result); + | ^~~~~~~~~~~ +--- a/meson.build ++++ b/meson.build +@@ -199,7 +199,10 @@ conf.set10( + conf.set( + 'HAVE_LIBNSS', + cc.links( +- '''int main(int argc, char **argv) { ++ '''#include ++ #include ++ #include ++ int main(int argc, char **argv) { + struct addrinfo hints, *result; + return getaddrinfo(argv[1], argv[2], &hints, &result); + } + diff --git a/sys-libs/libnvme/libnvme-1.3-r1.ebuild b/sys-libs/libnvme/libnvme-1.3-r1.ebuild new file mode 100644 index 000000000000..fe8743ba86d6 --- /dev/null +++ b/sys-libs/libnvme/libnvme-1.3-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-r1 meson + +DESCRIPTION="C Library for NVM Express on Linux" +HOMEPAGE="https://github.com/linux-nvme/libnvme" +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="dbus python ssl +uuid" + +SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + dev-libs/json-c:= + dbus? ( sys-apps/dbus:= ) + python? ( ${PYTHON_DEPS} ) + ssl? ( >=dev-libs/openssl-1.1:= ) + uuid? ( sys-apps/util-linux:= ) +" +RDEPEND="${DEPEND}" + +BDEPEND=" + dev-lang/swig +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) +" + +PATCHES=( + "${FILESDIR}"/${P}-configure-clang-16.patch +) + +src_configure() { + local emesonargs=( + -Dpython=false + $(meson_feature ssl openssl) + $(meson_feature dbus libdbus) + $(meson_use python) + ) + meson_src_configure +} + +python_compile() { + local emesonargs=( + -Dpython=true + ) + meson_src_configure --reconfigure + meson_src_compile +} + +src_compile() { + meson_src_compile + + if use python; then + python_copy_sources + python_foreach_impl python_compile + fi +} + +python_install() { + meson_src_install + use python && python_optimize +} + +src_install() { + use python && python_foreach_impl python_install + + meson_src_install +} diff --git a/sys-libs/libnvme/libnvme-1.3.ebuild b/sys-libs/libnvme/libnvme-1.3.ebuild deleted file mode 100644 index aaed25b8d4b8..000000000000 --- a/sys-libs/libnvme/libnvme-1.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-r1 meson - -DESCRIPTION="C Library for NVM Express on Linux" -HOMEPAGE="https://github.com/linux-nvme/libnvme" -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="dbus python ssl +uuid" - -SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" - -DEPEND=" - dev-libs/json-c:= - dbus? ( sys-apps/dbus:= ) - python? ( ${PYTHON_DEPS} ) - ssl? ( >=dev-libs/openssl-1.1:= ) - uuid? ( sys-apps/util-linux:= ) -" -RDEPEND="${DEPEND}" - -BDEPEND=" - dev-lang/swig -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -src_configure() { - local emesonargs=( - -Dpython=false - $(meson_feature ssl openssl) - $(meson_feature dbus libdbus) - $(meson_use python) - ) - meson_src_configure -} - -python_compile() { - local emesonargs=( - -Dpython=true - ) - meson_src_configure --reconfigure - meson_src_compile -} - -src_compile() { - meson_src_compile - - if use python; then - python_copy_sources - python_foreach_impl python_compile - fi -} - -python_install() { - meson_src_install - use python && python_optimize -} - -src_install() { - use python && python_foreach_impl python_install - - meson_src_install -} -- cgit v1.2.3