From 3e42d1577189af123b773dc0f11e5419035308c8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Apr 2024 23:59:37 +0100 Subject: gentoo auto-resync : 26:04:2024 - 23:59:36 --- dev-debug/Manifest.gz | Bin 4010 -> 4016 bytes dev-debug/gdb/Manifest | 2 +- dev-debug/gdb/gdb-14.2.ebuild | 2 +- dev-debug/valgrind/Manifest | 8 +- dev-debug/valgrind/valgrind-3.23.0.ebuild | 162 ++++++++++++++++++++++++++ dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild | 156 ------------------------- dev-debug/valgrind/valgrind-9999.ebuild | 20 ++-- 7 files changed, 181 insertions(+), 169 deletions(-) create mode 100644 dev-debug/valgrind/valgrind-3.23.0.ebuild delete 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 2521ac4c1209..3b5c8bd586e1 100644 Binary files a/dev-debug/Manifest.gz and b/dev-debug/Manifest.gz differ diff --git a/dev-debug/gdb/Manifest b/dev-debug/gdb/Manifest index 5d59c6c50847..4ad2bfd7e4ac 100644 --- a/dev-debug/gdb/Manifest +++ b/dev-debug/gdb/Manifest @@ -8,6 +8,6 @@ DIST gdb-14.1.tar.xz 24108624 BLAKE2B 52a07b4745f95561f360a597d6ec1d212dafc8e913 DIST gdb-14.2.tar.xz 24111936 BLAKE2B 65765dfd1ed08e19bb881fc7ae98d6ee4914f38a9a2bb0d0ca73bef472669664f807fe9c04e8dffd7025be98e736ac52f88ff5851ceddbb01a361885b18befc8 SHA512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede EBUILD gdb-13.2-r2.ebuild 8704 BLAKE2B 1d68e7432fe90bfa0a894edc545da4c8620f7a58ae8fd34f821b38903d28012b276bbf14bd20088639130762a9b9560fb3ee523b1a3073fb54e6ebe0febf4cae SHA512 19a36ac139e714e021dc24c8c9825d60458ea6ff3b03a495d8995fc70a40bb771f1b75acae43f082dc9c467b07d8dc11f8122c0911b335eb1b8d560cf58b1167 EBUILD gdb-14.1-r1.ebuild 9231 BLAKE2B 31fc4776392a7edc8a8acb68b3e8ff6019fe01b97649a566a6dcf4016f72c5d1eb81cf2ec7e2e79483850d0732cfb17a8dcb4d27374faac96fe42e8591977719 SHA512 029e076123eee3c6e17309ff263af8a235fd3a1979c75adfc0cf743f1b2dd4bc36ccf9673be7f0a8fbfd6f3ec06228522bca642fab80772e50c208cdfbb2615e -EBUILD gdb-14.2.ebuild 9067 BLAKE2B 648034794b0b4c70c5645337e7c859d640e8fdd0a9d1a92656dba01adc5f4c3416524804b4776bc10d1698b28f3b88e37ffe10798129491ab000000daad5570b SHA512 dbe86f068a52c3220c1a9d5ab1b3f181e7f5dfa8fa681d7be1b10750fc78b0f546491b0b6831409775b803531719aabfe236b49d930cb6bb1a671df33322f0ab +EBUILD gdb-14.2.ebuild 9060 BLAKE2B 50d6f298b105c81d48e644f2a0a7c65cc093cfe9a56b8e56ffa2ef3b2dda4932daa03dd650cd21368209cb1faff0da6c4133055572f6a3dcda035bdb235158b5 SHA512 35614c7e7a22ea3c56922ecc575357eb60bad7657845f7d7555fa38f98720a9520225250865f8e63b67d43fa5cfc02227ce7626f99e69ade86138a12fa4865fd EBUILD gdb-9999.ebuild 9067 BLAKE2B 648034794b0b4c70c5645337e7c859d640e8fdd0a9d1a92656dba01adc5f4c3416524804b4776bc10d1698b28f3b88e37ffe10798129491ab000000daad5570b SHA512 dbe86f068a52c3220c1a9d5ab1b3f181e7f5dfa8fa681d7be1b10750fc78b0f546491b0b6831409775b803531719aabfe236b49d930cb6bb1a671df33322f0ab MISC metadata.xml 1348 BLAKE2B 61eb80efbf21b4d0ededbe138710ef7ce69d4c2c137448d780a0a18db13b1b80ccfc41adf9cd825358bb952dae3a627f07d2cb89845ca52383d05fe32c494b49 SHA512 b50fe1fd5fccf7eddac4eff4fd7be955e02227763725b8e00d8e3606346afa978079ed8b754948b9a3ee065441acba4787b48c2b2d55535e0f8b9405fb4f2e90 diff --git a/dev-debug/gdb/gdb-14.2.ebuild b/dev-debug/gdb/gdb-14.2.ebuild index 541bf7f8915a..2a82d9e78706 100644 --- a/dev-debug/gdb/gdb-14.2.ebuild +++ b/dev-debug/gdb/gdb-14.2.ebuild @@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" if [[ -n ${REGULAR_RELEASE} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest index d9598d9f1cac..a807a64fb21d 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.RC2.tar.bz2 16551949 BLAKE2B 0104a56006cd4a1f4d3195c69d76b13f3eebb15b3cd490e6b78f5b0ad6267488e5b1b5502711fba171d213158d2bc9f4644c9f15b73ed00533748117afba5eef SHA512 36d20c08442bd00ae560693517d69ab5cc1665b210cb7510e6ab7cfa7ce7a35e0f289fdbedc0b1c682ad2698586e49c8c65e52bbe699eef3aec6b7b1fdb5b961 -DIST valgrind-3.23.0.RC2.tar.bz2.asc 488 BLAKE2B bc858fe769d9cc28ab0d17738075e0523de701bf67fc0f80bdbc258465fd1b60cedd7730156a186db20406b8a35fe79f6e58daf718dd59852384f7b445d2ce7d SHA512 b91c2ab157a3cf3042cde2b531a33b063d92c5bef8ae7e097d860b2b19a84ad372e4b7057a6d49ec8ad51a2cb2a80ecdf02115813f1c517b674a810876552512 +DIST valgrind-3.23.0.tar.bz2 16550038 BLAKE2B 9312761b0531006725f13270984b26c48f71ebe66e355b04410d7c01773c9b78ec21db3259cab398e58b3b68f93f5f074db06efe1f359bd7cf423515576191a4 SHA512 27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117 +DIST valgrind-3.23.0.tar.bz2.asc 488 BLAKE2B b06781577e3e84e506e56bd4acc7341aecacb6b5898d8f0daab627d24bc70c9c60edad11dc7e3723ac77aa9c7978f1e13af7734e7a37763c720e77ea4ff103a4 SHA512 e10b38c72ed1fb8d79a3fa84ab70c475ec7a15927a578ee6715aa74f9600453f0fb72551053b6c31583321c37dab100bafbf6e689c02a3bc06021f6092b4bc80 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_rc2.ebuild 4938 BLAKE2B cbab224bed9d5db52da2d724d5d92e0a9c2610e7e5f39284a6a8ee1f76d9d7f54323138e625061ab1627b4d2af83d2aabb4d64e37259fb0d627ba63eaff205e6 SHA512 8671b627a289dfe8b731469df18891b48f4f8117c7ee6304ce203da5480c087c9e2e6ae22214d234c3a1a5c8f4e08709e421c3aa506b0b55d4468fa92cab1dbd -EBUILD valgrind-9999.ebuild 4938 BLAKE2B cbab224bed9d5db52da2d724d5d92e0a9c2610e7e5f39284a6a8ee1f76d9d7f54323138e625061ab1627b4d2af83d2aabb4d64e37259fb0d627ba63eaff205e6 SHA512 8671b627a289dfe8b731469df18891b48f4f8117c7ee6304ce203da5480c087c9e2e6ae22214d234c3a1a5c8f4e08709e421c3aa506b0b55d4468fa92cab1dbd +EBUILD valgrind-3.23.0.ebuild 5060 BLAKE2B 7eb14640286f453a321dea3fcd70a4b3672d465a7a3466dc046528df9b535b05d1a90d2c303cdb2cb0a7e698f86eb5763bb2bb2dc7465fa5b9ae5b660a75d62e SHA512 d88c8830250cfa4e8b4af4fe313cc2b9408cbb0133cd8bfdd665f09530a2b3621d617e89fe1e5e45a7a1bc08085e22b8263aac7775a1a653d27ad1572ee4c52a +EBUILD valgrind-9999.ebuild 5060 BLAKE2B 7eb14640286f453a321dea3fcd70a4b3672d465a7a3466dc046528df9b535b05d1a90d2c303cdb2cb0a7e698f86eb5763bb2bb2dc7465fa5b9ae5b660a75d62e SHA512 d88c8830250cfa4e8b4af4fe313cc2b9408cbb0133cd8bfdd665f09530a2b3621d617e89fe1e5e45a7a1bc08085e22b8263aac7775a1a653d27ad1572ee4c52a MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1 diff --git a/dev-debug/valgrind/valgrind-3.23.0.ebuild b/dev-debug/valgrind/valgrind-3.23.0.ebuild new file mode 100644 index 000000000000..efcec418f726 --- /dev/null +++ b/dev-debug/valgrind/valgrind-3.23.0.ebuild @@ -0,0 +1,162 @@ +# 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 + # Needed for man pages + BDEPEND+=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + " +else + 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() { + if [[ ${PV} == 9999 ]]; then + # TODO: Could do HTML docs too with 'all-docs' + emake -C docs man-pages FAQ.txt + mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" + fi + + default + + 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 deleted file mode 100644 index 5a073f147105..000000000000 --- a/dev-debug/valgrind/valgrind-3.23.0_rc2.ebuild +++ /dev/null @@ -1,156 +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 - ) - - 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 5a073f147105..efcec418f726 100644 --- a/dev-debug/valgrind/valgrind-9999.ebuild +++ b/dev-debug/valgrind/valgrind-9999.ebuild @@ -37,8 +37,14 @@ IUSE="mpi" DEPEND="mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" -if [[ ${PV} != 9999 ]] ; then - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )" +if [[ ${PV} == 9999 ]] ; then + # Needed for man pages + BDEPEND+=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + " +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-valgrind )" fi PATCHES=( @@ -121,14 +127,14 @@ src_test() { } src_install() { - default - - if [[ ${PV} == "9999" ]]; then - # Otherwise FAQ.txt won't exist: - emake -C docs FAQ.txt + if [[ ${PV} == 9999 ]]; then + # TODO: Could do HTML docs too with 'all-docs' + emake -C docs man-pages FAQ.txt mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" fi + default + dodoc FAQ.txt pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux -- cgit v1.2.3