From f63d9a9a54cdeeaadc78e460b82f2c9895a69384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 23 Oct 2023 14:39:50 +0100 Subject: gentoo auto-resync : 23:10:2023 - 14:39:50 --- dev-util/valgrind/Manifest | 5 +- dev-util/valgrind/valgrind-3.22.0_rc1.ebuild | 152 +++++++++++++++++++++++++++ dev-util/valgrind/valgrind-9999.ebuild | 17 ++- 3 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 dev-util/valgrind/valgrind-3.22.0_rc1.ebuild (limited to 'dev-util/valgrind') diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 06132dd6d6cb..b87359ac0ae1 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -10,8 +10,11 @@ DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c SHA512 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba +DIST valgrind-3.22.0.RC1.tar.bz2 16414739 BLAKE2B 21b59e3c749c9a4fdab91568c942bd8a2c21ecadb053c88aa11563c739f8c87f403cd2a2bf03a3c6556c750a0190f2a1c4ff445355991f16d6f6a58b0be50fa1 SHA512 0aa9e98a959808d20cce53575433f81973ef3de3acc313ef2700f58cf9b2b7ee951b5bc701ef8508f5c136cb14239bbe7d81ae4208679ba55150b3edfd6078f0 +DIST valgrind-3.22.0.RC1.tar.bz2.asc 488 BLAKE2B 938e032fc51e40c816fa6cec4fd95c6f183692d4d30988355bbb217984245fc7a0e6f70314f998511ab081bd2c5feeb217b025dcc84173afe7db7c04a9ebc063 SHA512 6b6518c633d40431bcf6836b0f0b67b44d7bf04a7b598dcd9707f479607a8cf9f6ca9320ddbf0d972db084c7e5bb5a02f866f5dc95c06e973d35597bf2f65695 EBUILD valgrind-3.20.0-r2.ebuild 4300 BLAKE2B a7c9b1f23d8e84375846633c1f91e48cf12ac40b9238b2f0d0edd3500c28706837ec1733f7c81e81c2469ae444e8153ea64670c1612e696205629171d3578019 SHA512 7ad54251e9ae5ac05dbb7bc5d59113d7c74cd3a98e1085e6c907672fde857ce2f5acd4ce02aa616db3e4aada01ad3e0923d5695b7e14623e3537dc316b27f823 EBUILD valgrind-3.21.0-r1.ebuild 4087 BLAKE2B 3e615ab2b642809cef8220734be89fd63b42bf33e725e28c6b9095f8f0b0036d072904447b8b8be3b42c3f7279c63baeb2398e034e4e414aadb399c2b3d9af1e SHA512 69a47d9c01df9f2e94a91dc7de85dfa11d0dd2d291682d607236c8f0de7cbc91c45a41c269ada95e8d341aafa0fbac83556219a0b0e593104ea27d5ed10cdb65 EBUILD valgrind-3.21.0-r2.ebuild 4459 BLAKE2B a7fa39fdcd43d30a396101eb073b05ba7e3c92c6f04eae0c63f9d2782742e3929d80aa77aceb7d887a862dc0f0491f0d8e671996270a371a1b40b414ee123e7d SHA512 5814b127f0a5870297056f07914a74dec21a50892ede7be5a730f255394578a15a99b888d053981277e2bc04b39ac92ec1467146fd729f77c6735f69358e74ae -EBUILD valgrind-9999.ebuild 4522 BLAKE2B 496c4eb8913b525876b5e16b9a27746163ef0c20f9face4582a770d5f6fb198f06e5ed1f0c7c8dd74242f06ae6500dd9a6c70e8af3c4f3a19ba685798fad876c SHA512 91c7b93e69d1a7c8cab4b202999415a19949605493400cb545156ea2b2c6d3648f8854d592be437a2b138230c0d405e7dfca9b01bee1a781b372075544033711 +EBUILD valgrind-3.22.0_rc1.ebuild 4714 BLAKE2B 72f442412d3e569ef69c22c9ea1c719d5d9b70eae205967bb6f7f6daad8b2be5047eaabb4b78338df46b043d428e9a52432e6d7a93b2e86168ae98fac0b1f561 SHA512 317b6fd22f1ff4c20d6c7caba67d257f892b84eac33615b6986f7f53ed8c215cdaa248f64a68d19c17c1c04011400121b5ea22620b7c8d90baa2aa16eb171d61 +EBUILD valgrind-9999.ebuild 4714 BLAKE2B 72f442412d3e569ef69c22c9ea1c719d5d9b70eae205967bb6f7f6daad8b2be5047eaabb4b78338df46b043d428e9a52432e6d7a93b2e86168ae98fac0b1f561 SHA512 317b6fd22f1ff4c20d6c7caba67d257f892b84eac33615b6986f7f53ed8c215cdaa248f64a68d19c17c1c04011400121b5ea22620b7c8d90baa2aa16eb171d61 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f diff --git a/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild b/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild new file mode 100644 index 000000000000..26eb51e592fd --- /dev/null +++ b/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# The Valgrind upstream maintainer also maintains it in Fedora and will +# backport fixes there which haven't yet made it into a release. Keep an eye +# on it for fixes we should cherry-pick too: +# https://src.fedoraproject.org/rpms/valgrind/tree/rawhide + +inherit autotools flag-o-matic toolchain-funcs multilib pax-utils + +DESCRIPTION="An open-source memory debugger for GNU/Linux" +HOMEPAGE="https://valgrind.org" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://sourceware.org/git/${PN}.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg + inherit verify-sig + + MY_P="${P/_rc/.RC}" + SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )" + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + fi +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="mpi" + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" +if [[ ${PV} != 9999 ]] ; then + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )" +fi + +PATCHES=( + # Respect CFLAGS, LDFLAGS + "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch + "${FILESDIR}"/${PN}-3.21.0-glibc-2.34-suppressions.patch + "${FILESDIR}"/${PN}-3.21.0-memcpy-fortify_source.patch +) + +src_prepare() { + # Correct hard coded doc location + sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die + + # Don't force multiarch stuff on OSX, bug #306467 + sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die + + if [[ ${CHOST} == *-solaris* ]] ; then + # upstream doesn't support this, but we don't build with + # Sun/Oracle ld, we have a GNU toolchain, so get some things + # working the Linux/GNU way + find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ + sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die + cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in + fi + + default + + # Regenerate autotools files + eautoreconf +} + +src_configure() { + local myconf=( + --with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load + ) + + # Respect ar, bug #468114 + tc-export AR + + # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" + # while compiling insn_sse.c in none/tests/x86 + # -fstack-protector more undefined references to __guard and __stack_smash_handler + # because valgrind doesn't link to glibc (bug #114347) + # -fstack-protector-all Fails same way as -fstack-protector/-fstack-protector-strong. + # Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it + # -fstack-protector-strong See -fstack-protector (bug #620402) + # -m64 -mx32 for multilib-portage, bug #398825 + # -ggdb3 segmentation fault on startup + # -flto* fails to build, bug #858509 + filter-flags -fomit-frame-pointer + filter-flags -fstack-protector + filter-flags -fstack-protector-all + filter-flags -fstack-protector-strong + filter-flags -m64 -mx32 + filter-flags -fsanitize -fsanitize=* + replace-flags -ggdb3 -ggdb2 + filter-lto + + if use amd64 || use ppc64; then + ! has_multilib_profile && myconf+=("--enable-only64bit") + fi + + # Force bitness on darwin, bug #306467 + use x64-macos && myconf+=("--enable-only64bit") + + # Don't use mpicc unless the user asked for it (bug #258832) + if ! use mpi; then + myconf+=("--without-mpicc") + fi + + econf "${myconf[@]}" +} + +src_test() { + # fxsave.o, tronical.o have textrels + emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check +} + +src_install() { + default + + if [[ ${PV} == "9999" ]]; then + # Otherwise FAQ.txt won't exist: + emake -C docs FAQ.txt + mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" + fi + + dodoc FAQ.txt + + pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux + + # See README_PACKAGERS + dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/* + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_names on shared libraries, can't turn them into bundles, + # as dyld won't load them any more then, bug #306467 + local l + for l in "${ED}"/usr/lib/valgrind/*.so ; do + install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" + done + fi +} + +pkg_postinst() { + elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols." + elog "To fix this you can add splitdebug to FEATURES in make.conf" + elog "and remerge glibc. See:" + elog "https://bugs.gentoo.org/214065" + elog "https://bugs.gentoo.org/274771" + elog "https://bugs.gentoo.org/388703" +} diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 35e98ebeba1d..26eb51e592fd 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -18,9 +18,15 @@ if [[ ${PV} == 9999 ]]; then else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg inherit verify-sig - SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2" - SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + + MY_P="${P/_rc/.RC}" + SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )" + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + fi fi LICENSE="GPL-2" @@ -105,6 +111,11 @@ src_configure() { econf "${myconf[@]}" } +src_test() { + # fxsave.o, tronical.o have textrels + emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check +} + src_install() { default -- cgit v1.2.3