commit: 40a2594278d50188df3336f48a2d9c6eae81cfc3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Oct 4 16:41:37 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 4 16:47:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a25942
sys-apps/osinfo-db-tools: don't redefine _FORTIFY_SOURCE Closes: https://bugs.gentoo.org/892996 Signed-off-by: Sam James <sam <AT> gentoo.org> ...db-tools-1.10.0-no-clobber-fortify-source.patch | 13 ++++++ .../osinfo-db-tools-1.10.0-r2.ebuild | 52 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch new file mode 100644 index 000000000000..512bddfbe8c2 --- /dev/null +++ b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch @@ -0,0 +1,13 @@ +Don't clobber toolchain defaults. + +https://bugs.gentoo.org/892996 +--- a/meson.build ++++ b/meson.build +@@ -204,7 +204,6 @@ osinfo_db_tools_check_cflags = [ + '-Wjump-misses-init', + '-Wframe-larger-than=4096', + '-Wno-overlength-strings', +- '-Wp,-D_FORTIFY_SOURCE=2', + '--param=ssp-buffer-size=4', + '-fexceptions', + '-fasynchronous-unwind-tables', diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild new file mode 100644 index 000000000000..220ff049a956 --- /dev/null +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit meson python-any-r1 + +DESCRIPTION="Tools for managing the osinfo database" +HOMEPAGE="https://libosinfo.org/"; +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + dev-libs/json-glib + >=app-arch/libarchive-3.0.0:= + net-libs/libsoup:3.0 + >=dev-libs/libxml2-2.6.0 +" +# perl dep is for pod2man (manpages) +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/gettext-0.19.8 + dev-lang/perl + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch +) + +python_check_deps() { + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +}
