From 6243676c91946098c06d42bc87b5eb99aac40bf0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Apr 2024 23:59:45 +0100 Subject: gentoo auto-resync : 25:04:2024 - 23:59:45 --- dev-debug/Manifest.gz | Bin 4014 -> 4010 bytes dev-debug/valgrind/Manifest | 8 +- dev-debug/valgrind/valgrind-3.23.0_rc1.ebuild | 154 ------------------------- dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild | 156 ++++++++++++++++++++++++++ dev-debug/valgrind/valgrind-9999.ebuild | 6 +- 5 files changed, 164 insertions(+), 160 deletions(-) delete mode 100644 dev-debug/valgrind/valgrind-3.23.0_rc1.ebuild create mode 100644 dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild (limited to 'dev-debug') diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz index 98e324191ca5..2521ac4c1209 100644 Binary files a/dev-debug/Manifest.gz and b/dev-debug/Manifest.gz differ diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest index c21ff70cd39d..d9598d9f1cac 100644 --- a/dev-debug/valgrind/Manifest +++ b/dev-debug/valgrind/Manifest @@ -10,11 +10,11 @@ DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba DIST valgrind-3.22.0.tar.bz2 16565502 BLAKE2B 80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514 SHA512 2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777 DIST valgrind-3.22.0.tar.bz2.asc 488 BLAKE2B 9e4d4cfac4dcc09bb62beeaa7b9f78bfafd0a6ae8d63e423ff81b7b8f5444a301e4c3030a241644c8070c36ee040832ce99f444678f22611457e325ceae18dd1 SHA512 c2317db564ef816d2b5d1a7f2f680dc1c6ea05abbffde660587946c986af179ea7ca2314d94c792f63f3043b6a44819ddf5661fd60ec2454a2c562e7d2711b36 -DIST valgrind-3.23.0.RC1.tar.bz2 16320808 BLAKE2B e66bdef3dcd1c5793bdd263dc12f55797d1b07add6c07cc57e06564a3b50447653a0e418be3bfecf1bffb15be7f0b906a75015a4c5f30d201eff9e79b72871f3 SHA512 6d9b95ce919ffa1993265c2972b407beb2879b87f84efd61ada4e75f334b332917a726b053c5dbc64b970a55334189c48ccae9231934c9474b65eb6ec1e2c18f -DIST valgrind-3.23.0.RC1.tar.bz2.asc 488 BLAKE2B d413285e74965581b7f1ab8f4ea8ef6b182ae73462d4ca4a5d34b6eafa70a4be3b36a92a1b9a84ee626817e9c87e9a67659e43cc7f6ec504a3afc609365b6441 SHA512 d0552673053bfeb1c5aba9fdee25e6e280de204d84d8bc8a0a723041844dea7071fdf55cdc8e3120ef42eb6adf746c725cca89471cf58d546c1112e3655cf688 +DIST valgrind-3.23.0.RC2.tar.bz2 16551949 BLAKE2B 0104a56006cd4a1f4d3195c69d76b13f3eebb15b3cd490e6b78f5b0ad6267488e5b1b5502711fba171d213158d2bc9f4644c9f15b73ed00533748117afba5eef SHA512 36d20c08442bd00ae560693517d69ab5cc1665b210cb7510e6ab7cfa7ce7a35e0f289fdbedc0b1c682ad2698586e49c8c65e52bbe699eef3aec6b7b1fdb5b961 +DIST valgrind-3.23.0.RC2.tar.bz2.asc 488 BLAKE2B bc858fe769d9cc28ab0d17738075e0523de701bf67fc0f80bdbc258465fd1b60cedd7730156a186db20406b8a35fe79f6e58daf718dd59852384f7b445d2ce7d SHA512 b91c2ab157a3cf3042cde2b531a33b063d92c5bef8ae7e097d860b2b19a84ad372e4b7057a6d49ec8ad51a2cb2a80ecdf02115813f1c517b674a810876552512 EBUILD valgrind-3.21.0-r1.ebuild 4075 BLAKE2B 06c7d359248ebcdab7c99c06e1f8ffe978f92e22ef866bcc936ec719b61a79404e6f1831f968624063da083da27911ea804f6223734d2dd16d4883e7d097fa87 SHA512 edcad8bf726f8991a561e51a42e8ee2bb4f52a9641c12bacc86ad578cd38b3f7bcb10eada151c8ed9b739fd08fdb5d595131ed71c40170f3276d7cb04344161e EBUILD valgrind-3.21.0-r2.ebuild 4445 BLAKE2B 411c77687c2a5c58755213b2f5ae50c3bcd8bd6bdcf17894acc9b4b1a2ca24b684f5ab3642f0bcf213e908c74f159c81ae4ed3fb58f196a04494b4dd8b1f1f44 SHA512 d2db8635cc329ecd1279ff476035cb5facc349bbdea49551f1cc9352ed1c9280a22c18a08fb5db6ee352c8ecbdae3847b20a4a57748b835f36fee925fa43c72b EBUILD valgrind-3.22.0-r2.ebuild 5136 BLAKE2B 5f33c119e0816629ca1de0c6f78889741c38ff4c4cbb20d9a953584a108939c02ab8a4d458090f2541bbbfc6dbaa0d0895e80776532c9805aac2363d4c15693a SHA512 5e6fdf459831db0b1b64a2263c542e93bb17f43e2770e5cd3acaace1325424ac440927768c88346941fc3c43b1b9741552aec64c32a5c5fbcdd89d7687ca7cb7 -EBUILD valgrind-3.23.0_rc1.ebuild 4882 BLAKE2B b0aa81bf3da445d40d1306e808fc9867ac69c61da9d08b8779403da9504afdb51c578b07b02e07c0a30052659d4cd6e5169d3aac8e8adbd35a320819fa3e69a3 SHA512 839ab36d6d04cae1934f396ffc037de5e1f41d0ddce6891350f187e155ec2a358a430d3798a7551aa7ca0abb301bd15f4fc90fe8fd3108ff5c77224006ddbdfe -EBUILD valgrind-9999.ebuild 4842 BLAKE2B eae9f32b2ee888ad390d5a67f04e5e7e97da00d06ea0df5a4da2c914ad091ceff47e2b31083198284e5ff3791ba1d826bb56fd852cdb609dfe4f6f9d55eb600a SHA512 bf97bfae37c916e96509f3c4592e5214406670ca4c4ecd4b2b6e4c4ec75b4f6b65024effbcb90d89ce8ce79d554c4af7fcdf8338f056566107805e965127e4a3 +EBUILD valgrind-3.23.0_rc2.ebuild 4938 BLAKE2B cbab224bed9d5db52da2d724d5d92e0a9c2610e7e5f39284a6a8ee1f76d9d7f54323138e625061ab1627b4d2af83d2aabb4d64e37259fb0d627ba63eaff205e6 SHA512 8671b627a289dfe8b731469df18891b48f4f8117c7ee6304ce203da5480c087c9e2e6ae22214d234c3a1a5c8f4e08709e421c3aa506b0b55d4468fa92cab1dbd +EBUILD valgrind-9999.ebuild 4938 BLAKE2B cbab224bed9d5db52da2d724d5d92e0a9c2610e7e5f39284a6a8ee1f76d9d7f54323138e625061ab1627b4d2af83d2aabb4d64e37259fb0d627ba63eaff205e6 SHA512 8671b627a289dfe8b731469df18891b48f4f8117c7ee6304ce203da5480c087c9e2e6ae22214d234c3a1a5c8f4e08709e421c3aa506b0b55d4468fa92cab1dbd MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1 diff --git a/dev-debug/valgrind/valgrind-3.23.0_rc1.ebuild b/dev-debug/valgrind/valgrind-3.23.0_rc1.ebuild deleted file mode 100644 index 625625cc2679..000000000000 --- a/dev-debug/valgrind/valgrind-3.23.0_rc1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 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 -# -# Also check the ${PV}_STABLE branch upstream for backports. - -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=/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 - # From stable branch -) - -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 - - 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 - # -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line') - # -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=* - filter-flags -fharden-control-flow-redundancy - append-cflags $(test-flags-CC -fno-harden-control-flow-redundancy) - 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 CFLAGS="${CFLAGS} -fno-strict-aliasing" 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-debug/valgrind/valgrind-3.23.0_rc2.ebuild b/dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild new file mode 100644 index 000000000000..5a073f147105 --- /dev/null +++ b/dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2024 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 +# +# Also check the ${PV}_STABLE branch upstream for backports. + +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=/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 + # From stable branch +) + +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 + + eautoreconf +} + +src_configure() { + local myconf=( + --with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load + ) + + tc-is-lto && myconf+=( --enable-lto ) + + # 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 + # -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line') + 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=* + filter-flags -fharden-control-flow-redundancy + append-cflags $(test-flags-CC -fno-harden-control-flow-redundancy) + 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 + # -fno-strict-aliasing: https://bugs.kde.org/show_bug.cgi?id=486093 + emake CFLAGS="${CFLAGS} -fno-strict-aliasing" 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-debug/valgrind/valgrind-9999.ebuild b/dev-debug/valgrind/valgrind-9999.ebuild index e79b850d13a3..5a073f147105 100644 --- a/dev-debug/valgrind/valgrind-9999.ebuild +++ b/dev-debug/valgrind/valgrind-9999.ebuild @@ -75,6 +75,8 @@ src_configure() { --with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load ) + tc-is-lto && myconf+=( --enable-lto ) + # Respect ar, bug #468114 tc-export AR @@ -87,7 +89,6 @@ src_configure() { # -fstack-protector-strong See -fstack-protector (bug #620402) # -m64 -mx32 for multilib-portage, bug #398825 # -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line') - # -flto* fails to build, bug #858509 filter-flags -fomit-frame-pointer filter-flags -fstack-protector filter-flags -fstack-protector-all @@ -115,7 +116,8 @@ src_configure() { src_test() { # fxsave.o, tronical.o have textrels - emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check + # -fno-strict-aliasing: https://bugs.kde.org/show_bug.cgi?id=486093 + emake CFLAGS="${CFLAGS} -fno-strict-aliasing" LDFLAGS="${LDFLAGS} -Wl,-z,notext" check } src_install() { -- cgit v1.2.3