diff options
Diffstat (limited to 'dev-util')
43 files changed, 59 insertions, 1852 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 1fe3c2a51665..777049c647a0 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest index 9a1f6375ec5d..a5cbb247a468 100644 --- a/dev-util/android-ndk/Manifest +++ b/dev-util/android-ndk/Manifest @@ -3,10 +3,10 @@ DIST android-ndk-r13b-linux-x86_64.zip 687311866 BLAKE2B 2db7bfd9fa937d5f28fa238 DIST android-ndk-r14b-linux-x86_64.zip 840626594 BLAKE2B 5032893ee34e7167c5af5216d7b1357c3f9dcef136d63fa9a1d6c4849471430ac21a741e1c2439ec62b5cb1fa79af9ff39b46c31073e47e7a6f7c41e1a1a448b SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a DIST android-ndk-r16b-linux-x86_64.zip 852525873 BLAKE2B 18f6e602d88ef0a8f1a7f31bc127547c32bc2fb133d5c87ca4d2f7099f79b54d67f578a68fcd59e94c84934ca2006decca5b09eac566f2f99d609862d4036e48 SHA512 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7 DIST android-ndk-r18-linux-x86_64.zip 556932539 BLAKE2B 52bde148e142fe72402d8ab6709b1dcb611f74c0cb8b511b3f0e69a2b6940ee5e05b1d4bd45fdff80f74f65ca3d8176de46bd0a3aa28e2dfd430fc07eab23d69 SHA512 7a8b372be53a7d5a008b6cafda451096623af33aea910edd8e98ee4b15682da5d2ad641727ab12eca522ba965073a3eb247cd3cd850c9b602e2c7b1cd6eec708 -EBUILD android-ndk-11c-r1.ebuild 1674 BLAKE2B fcb3c2266cebf182ada146ba4febb708525c4969926ed16b41a255a7e02726050270f6b9d73228b92f755a31ebfaba6ac8a6787c8fa2014e81dd1ed84185d15d SHA512 b44c037a7ec079abd0334268d519d945b5310403732c453ca6bea12b1755ad6d78379fc7a97bbab04a8313705ebe9e7ba9f3c41c8420914831ba5a5504c89930 -EBUILD android-ndk-11c.ebuild 1627 BLAKE2B 2156d7bf49ea3425d6f7c118f7be5665a8842f4a618fcfc6bec06c19d42aa20d85ad85263b24321a8ae802512220a81f60021fd5515932be2160b32d64bd7ac1 SHA512 96e790779b2d952ac91b8cb61123baae8065096d2dd8d3f47e4fcee144f674540887e6e2e04a7c70539ecf65a747ad253812b8385e5d1eff89948a4a926a9d10 -EBUILD android-ndk-13b.ebuild 1674 BLAKE2B fcb3c2266cebf182ada146ba4febb708525c4969926ed16b41a255a7e02726050270f6b9d73228b92f755a31ebfaba6ac8a6787c8fa2014e81dd1ed84185d15d SHA512 b44c037a7ec079abd0334268d519d945b5310403732c453ca6bea12b1755ad6d78379fc7a97bbab04a8313705ebe9e7ba9f3c41c8420914831ba5a5504c89930 -EBUILD android-ndk-14b.ebuild 1643 BLAKE2B 2994a667f49de46dfc9632e8f19e9b13c9be6d55a8cc694efe1ec8cbc73c71f16bcd0040e49427688fa17a8ea201a31afa27380c4e9a99867cabd483ce2e7be6 SHA512 9f95ade0d9e10956bb23a6a8bf682d160c2dce1a4af115587a142f1397b46e2434b1766c8cc72adc618b574c6de1b5d3f7a45c4afa5872e827b070da086b709a -EBUILD android-ndk-16b.ebuild 1643 BLAKE2B 2994a667f49de46dfc9632e8f19e9b13c9be6d55a8cc694efe1ec8cbc73c71f16bcd0040e49427688fa17a8ea201a31afa27380c4e9a99867cabd483ce2e7be6 SHA512 9f95ade0d9e10956bb23a6a8bf682d160c2dce1a4af115587a142f1397b46e2434b1766c8cc72adc618b574c6de1b5d3f7a45c4afa5872e827b070da086b709a -EBUILD android-ndk-18.ebuild 1617 BLAKE2B 68fafee951b7fe9d79e1fd0e9c6c2b50aa830af859730119017521fb6d25bdeb2ac8a7f96e5e5fa94e06b5983cc071a483543f303f3281676af6ed26578e3e0e SHA512 c2def3471d108b6f7de54c43e8f4b630d236b763d74c7828bde0d59624d6a75bd56eaa1940be95a8bff3503ad715d4408e32940bd0b653bcf3cbaf3c1db754ae +EBUILD android-ndk-11c-r1.ebuild 1674 BLAKE2B e41391c44517dd37d7a704133f241114a290918ec90424ed1ecafa5ea62ac361953f59891dba42d3671f58094689fcae871c6a1be827dc9ec0c71a508cf07440 SHA512 98101f5dc0e5999d9fef8c41fbb2fb570d49776abf5f9d6a57756255a443de976ed33a2f08f7333eae359f366fc3d49c25849b47ee8cab87265a218a22e057a2 +EBUILD android-ndk-11c.ebuild 1627 BLAKE2B 6c3b44fbe8c594d11d160ba1a5061ac36f2ba36a2abb8175ede842237ba17ccf3edde653b8414b3bc9a055874be9b4135be4146fbd99dde2625863511207df5c SHA512 f192a8e61eff83dbc0327ea4ee7b940655abe863769700201e3357bbcc8b07a79b66a68c8f8cfd6dfae22db8e8648c330cd4ada336ea7b1cd54a7369447a5368 +EBUILD android-ndk-13b.ebuild 1674 BLAKE2B e41391c44517dd37d7a704133f241114a290918ec90424ed1ecafa5ea62ac361953f59891dba42d3671f58094689fcae871c6a1be827dc9ec0c71a508cf07440 SHA512 98101f5dc0e5999d9fef8c41fbb2fb570d49776abf5f9d6a57756255a443de976ed33a2f08f7333eae359f366fc3d49c25849b47ee8cab87265a218a22e057a2 +EBUILD android-ndk-14b.ebuild 1643 BLAKE2B a4af81e7d064cc032cbf4c250e87546d5cc860421bc9ec2cfeef8126bb918fc9395de090570db764a9c99d7b555c05fb6d5bdd6a9c162bf9b14dfd3d2074deeb SHA512 d189fc5b97277ee77c6496f9f29770a807cabcbf8bf6e2557c4216818f8af80d2497526d085ca6e358d1f679ae9f1081fbcfa0c8e1fe7bb4322f343bb4410a7e +EBUILD android-ndk-16b.ebuild 1643 BLAKE2B a4af81e7d064cc032cbf4c250e87546d5cc860421bc9ec2cfeef8126bb918fc9395de090570db764a9c99d7b555c05fb6d5bdd6a9c162bf9b14dfd3d2074deeb SHA512 d189fc5b97277ee77c6496f9f29770a807cabcbf8bf6e2557c4216818f8af80d2497526d085ca6e358d1f679ae9f1081fbcfa0c8e1fe7bb4322f343bb4410a7e +EBUILD android-ndk-18.ebuild 1617 BLAKE2B 494109c019c354fb1f832b74124bc9318333c705ee5c6e289938d992e1b50666f9e7671d3b856ea2625e65ccf2eb5ecc68dca3bee563dc021c7f89d32012f371 SHA512 b96e68402c42703a45f4295c2f3ceccda59574015321f8137dd4d6869bec99ff3055c8b89d6b1a952c29c2479215546530f53221ffa5cd231978ef16b10cfeb3 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/dev-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild index 705cbd78d6e5..19893ccb6759 100644 --- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild +++ b/dev-util/android-ndk/android-ndk-11c-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses-compat:5[tinfo] diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild index 08f44168102d..9f72e2cc9649 100644 --- a/dev-util/android-ndk/android-ndk-11c.ebuild +++ b/dev-util/android-ndk/android-ndk-11c.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 sys-libs/ncurses-compat:5 virtual/libcrypt" diff --git a/dev-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild index 705cbd78d6e5..19893ccb6759 100644 --- a/dev-util/android-ndk/android-ndk-13b.ebuild +++ b/dev-util/android-ndk/android-ndk-13b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses-compat:5[tinfo] diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild index dd21a3e831cb..535dd6a39767 100644 --- a/dev-util/android-ndk/android-ndk-14b.ebuild +++ b/dev-util/android-ndk/android-ndk-14b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses-compat:5[tinfo] diff --git a/dev-util/android-ndk/android-ndk-16b.ebuild b/dev-util/android-ndk/android-ndk-16b.ebuild index dd21a3e831cb..535dd6a39767 100644 --- a/dev-util/android-ndk/android-ndk-16b.ebuild +++ b/dev-util/android-ndk/android-ndk-16b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses-compat:5[tinfo] diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild index 7e1efb6dff77..1e630aefcd76 100644 --- a/dev-util/android-ndk/android-ndk-18.ebuild +++ b/dev-util/android-ndk/android-ndk-18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test" DEPEND="app-arch/p7zip" RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81 + >=dev-build/make-3.81 sys-libs/ncurses-compat:5[abi_x86_32(-),tinfo] virtual/libcrypt" diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 89c547ecdc17..6e1900b21508 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,3 +1,3 @@ DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090 -EBUILD gnome-builder-44.2-r1.ebuild 9143 BLAKE2B 4d712763a08ecfd70a9e02449003b1144f0c79dce7421783156d1af2b5cc1f72bfc0239af0c855d7d08c32834216a7c2e0011839c7c60d2c779a0308478d874f SHA512 5a8ddac91dddae2c5e5d8573e2bde7284a9fdcda679380f711e74d190f041292f7d7a222b7f31076c207e2024346d84b62316c8f1170f56915aaa97df0e52f96 +EBUILD gnome-builder-44.2-r1.ebuild 9145 BLAKE2B a72056b8d2b7fadd1244c22826b24ef45025eea6beef7fd584596c9ce6623aa006323c4c78b2529d7145a0c38d9f1e5aa1ab4644a1a766bd547d26fb80e1b956 SHA512 5d533561ab7c8d357060326c0c0054039713bf1ca8ea574b15469ff356a7baa865eef8d4ed47e10655e67daf6a4daf852a600a454f3821238e102b6264c7cb22 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2 diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild index 2ae312fca5da..8ba7549bcf34 100644 --- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild +++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISABLE_AUTOFORMATTING=1 FORCE_PRINT_ELOG=1 @@ -110,7 +110,7 @@ that are currently available with packages include: highlighting and symbol resolving support. * dev-python/python-lsp-server for more accurate Python autocompletion support. -* dev-util/valgrind for integration with valgrind. +* dev-debug/valgrind for integration with valgrind. * dev-util/meson for integration with the Meson build system. * virtual/rust for integration with the Rust Cargo build system. * dev-util/cmake for integration with the CMake build system. diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index d381f7570c9e..48af99013a53 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -11,6 +11,7 @@ AUX 1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch 4822 B AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61 AUX meson-1.2.1-llvm-17.patch 1658 BLAKE2B d111537d4b9befbb848a7da9ffc72f5cebf8caa80f2ab95f5dc3caa30481f3f055dd415e101438cb2f2b4ca8650b3c32a99dfde7029096e05d3cf9bb9ddc1828 SHA512 bc6b2bc1d60343502bf43beb655642bde3d04c10b7c068dba4bae1acec09e7907a9c09ceeacd2e82b35434c2e4f6090cc7df96130650787d4057a46d58b24ea3 AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08 +AUX meson-1.3.1-xtools-support.patch 1174 BLAKE2B 317f723447df25cc4b9607e1ba92e1f8c1296c6c7ed7539c0b8b43d71fefa784d292786d4e4df19d0aef395eff92a72609c10555abb7b172eda7bb9fea5da685 SHA512 e13216c4fda26feae64437997b5939dab21d7d2b24bf6450657cbae4361ec50a25edf4c9e30810ae8f036c03533481b77499bc3a34727ac55592c073c7099327 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e @@ -31,6 +32,6 @@ EBUILD meson-1.2.2.ebuild 3293 BLAKE2B 2e4f4bb4e7281e0af6b93874dfe05e2536d41e00f EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc EBUILD meson-1.3.0-r1.ebuild 3410 BLAKE2B 76f565c4ecf7f1b08e3447133c87221da251362d17152e5e7151c69e33057064d9998a181a9b10c0576d2caa744e62295b41a37a27eaa4e3ebca6aa10b273a59 SHA512 15ae4d826750895062d0986130612e993b8ce4a64d7ef154e1aae458b09a7985bc5f52d0319223b4db6b8995a8cff713f3a152c5d7785e0fddbc359c355f8d1b EBUILD meson-1.3.0-r2.ebuild 3566 BLAKE2B 2fe99b8c567c73a21c6d693fdd6bce7e27080e737bd18733bdeecdaf6d8e887b634561a0ccea9ddeef9d37fbc961e9cd81efd774a2cbc4a5c42245db3138e01c SHA512 2848384b4b620a1328463b715a40efe78265c65d6ff25cc647da9ac7adaca8c8ebe688770df45fbaadc01d5f47883799dd63aaa3db9cd2eda9ada6336198d4fb -EBUILD meson-1.3.1.ebuild 3588 BLAKE2B 245a20c4f1a296c6038c23485758abc00ddd3b225a4c964043a2f75ed76bbe2a8dfb7aed20b76c2324a01b9a3d3b386c4592e259268ab8838598cb427a9fcfc9 SHA512 84dcaf773703132c1e68a824aa9749634ea9ca5b3585c0fc467b8881583ef0fdf5470e592adb4d238080bd18da55a9489263fb142ba4aab245e8ca19219c7d8e +EBUILD meson-1.3.1.ebuild 3636 BLAKE2B 6f2fe1c9eb23bd9f2bcddffc0093214f926e21b830abc45711f0e6c995d737105975a944ebf18e1b68be5073eab9721d02d0dcddd756910b5d7b000f116e494b SHA512 416fc8b13ed941a9c2a4ae5d279f01fb093fe25726585b2784a700ca5a60c07511899d42f4ede437e6f0c470a6f810bbc4b01bc7755f4fd3b4691a5cd48016e3 EBUILD meson-9999.ebuild 3235 BLAKE2B a70383fb27538f5539c16d0ca07f1cff24def033d6bde05053657c8c5217798ce65c3e15f599aa15f54f173b7ddcceefc4debb5af4ab53284cf75900a1e97152 SHA512 6d6afb4820807ef0d852ea7d7284ca574d089767917a4f1157726505e98aad1e4c485701023bbb99d7bec174dda802ccb16375237d5e05c874b59f058eceda43 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5 diff --git a/dev-util/meson/files/meson-1.3.1-xtools-support.patch b/dev-util/meson/files/meson-1.3.1-xtools-support.patch new file mode 100644 index 000000000000..6e9e670ba8da --- /dev/null +++ b/dev-util/meson/files/meson-1.3.1-xtools-support.patch @@ -0,0 +1,26 @@ +linkers_detect: detect xtools (Apple ld64 derivative) + +xtools is in use on x86_64 and ppc based darwin Prefix installs. Pick +it up as a valid linker. + +Meson is the only thing known at this point to try and figure out what +linker is in use exactly, so instead of changing the linker (xtools), +just teach Meson about xtools. + +Author: Fabian Groffen <grobian@gentoo.org> +Bug: https://bugs.gentoo.org/868516 + +--- a/mesonbuild/linkers/detect.py ++++ b/mesonbuild/linkers/detect.py +@@ -185,6 +185,11 @@ + v = search_version(o) + + linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) ++ # detect xtools first, bug #868516 ++ elif 'xtools-' in o.split('\n')[0]: ++ xtools = o.split(' ')[0] ++ v = xtools.split('-')[1] ++ linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) + # First might be apple clang, second is for real gcc, the third is icc. + # Note that "ld: unknown option: " sometimes instead is "ld: unknown options:". + elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option' in e: diff --git a/dev-util/meson/meson-1.3.1.ebuild b/dev-util/meson/meson-1.3.1.ebuild index 2498ea56a83a..0f026f75c31e 100644 --- a/dev-util/meson/meson-1.3.1.ebuild +++ b/dev-util/meson/meson-1.3.1.ebuild @@ -54,6 +54,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch + "${FILESDIR}"/${PN}-1.3.1-xtools-support.patch # backport fix for hiding compiler warnings (such as Modern C) in vala and cython "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch diff --git a/dev-util/mk-configure/Manifest b/dev-util/mk-configure/Manifest index e79697d8c43c..4de1ab471785 100644 --- a/dev-util/mk-configure/Manifest +++ b/dev-util/mk-configure/Manifest @@ -1,5 +1,5 @@ DIST mk-configure-0.38.2.tar.gz 359518 BLAKE2B 17b28686d8d4d81373d86e4f23f4f9540cb62338b31aabbf21072c6ebe364d12db3fad2da6e7c0a2a5a6af39db099960879794dd7c9cb014e0cedea211c2fa5e SHA512 dd6542c39b24513288e69c0b971aa3c602bc450a812f1758b26c7f6b0cb9864a1a1d8e04153fb79394a53f7be1a5990c4dcf090d56de8edc8a6a7580799cbe76 DIST mk-configure-0.38.3.tar.gz 362541 BLAKE2B 6c071fbeef508bb35be9983d0c89d573b1f3b2753511361406776f245559f9c419199a90482f4979e20121084f683a6fd5b4dd38db3b3a3a71727a354a3470a0 SHA512 646cfe82f126299824bd1f2412ca66c75acfef9fd115d37dec23cb69072f9ed3801318de15aa957843d2f6a7a124b5bd411f06408f86aeaed1b58949ffb7ff5e -EBUILD mk-configure-0.38.2-r1.ebuild 1854 BLAKE2B 44d7b1a0d41b9826c890a567dd1487a0ef2634ee7eb9e251fdcc01fce7e3a396126d6892956e89b878bb48787c2926d53be5a14221dc472687e04a5269e2c13a SHA512 2a6a2f75df214b7946e629015e9200d0d82117f38b021bf824121bd39746d06955e93b073f16ad3de58c5849b93ef11c0b7f7dac97a65eb9a43881d30d1e68bf -EBUILD mk-configure-0.38.3.ebuild 1900 BLAKE2B e6fb2495a3861d2b93d0504e48ae4de7c210eddfc8d8e0d20fde2c4a9890dc0ab43fc4ca2a7bb2e93252b2dad541eca9377b8039f2fb79fc38144b96e66536a8 SHA512 23afa049b9132e5eeb7596cf06f361337ca02d20260d97ab6f568320b4c0635004a4d307fb4a637b924b1fd422aed8e12860d8878fb624bdfe672b0d92223b7c +EBUILD mk-configure-0.38.2-r1.ebuild 1859 BLAKE2B 77f644b6320fd4ece491c49586f8338903bf10c01f1a40b30b444c7b0942fe2e8b35c60354c7cfc654cb65a96c741defacae2272c628562f912fa0257488cbdf SHA512 9d493189b1c101394f15b7853434d39f2b7fd21ffccda350c11b53bf4343085f21cf92840652dd4bd9c1b69babd737a36fbd0f7d6d7e4ba3e20dc87fb5c1ae45 +EBUILD mk-configure-0.38.3.ebuild 1905 BLAKE2B 6b577d4745a364c924d0dae3810d1f9d7bb2001865bd25902039ba39111c5688e451b4e5e4beead4b810c3d7749c939226c6e2247e27288486956b655fe88d4b SHA512 d03bcdec8fd27b743192b8f691a4563c8bed1369a0b1759a83d5751bb35f90100ecace71330260cd634fe70b69a1b72469c6da752824ad277bde695274f93ba0 MISC metadata.xml 382 BLAKE2B da0a75f928295c179866da180acd537f8b964b029f5d5f99aac2f84190fe9e2497b2845f6c5c506b236c650a6e460431183f24e0439b6bb81258567a5338bfc3 SHA512 e83bb04295df653acca72744e9575e8aed59063f5214409a99b32cec79a8fa54537545f8be839d4063831e8605ef52c7aad92491b3066364e1eea1750fdc1f17 diff --git a/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild b/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild index 6b85d2dc2c14..5426f1588be7 100644 --- a/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild +++ b/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~riscv ~x86" RESTRICT="test" RDEPEND=" - || ( x11-misc/makedepend sys-devel/pmake ) - sys-devel/bmake + || ( x11-misc/makedepend dev-build/pmake ) + dev-build/bmake " BDEPEND="${RDEPEND}" diff --git a/dev-util/mk-configure/mk-configure-0.38.3.ebuild b/dev-util/mk-configure/mk-configure-0.38.3.ebuild index 80a024eec43b..03fd6afa457d 100644 --- a/dev-util/mk-configure/mk-configure-0.38.3.ebuild +++ b/dev-util/mk-configure/mk-configure-0.38.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc" RESTRICT="test" RDEPEND=" - || ( x11-misc/makedepend sys-devel/pmake ) - sys-devel/bmake + || ( x11-misc/makedepend dev-build/pmake ) + dev-build/bmake " BDEPEND="${RDEPEND}" diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest deleted file mode 100644 index 8a2107651fc3..000000000000 --- a/dev-util/ninja/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42 -DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -EBUILD ninja-1.11.1-r2.ebuild 2543 BLAKE2B 5a7e075acc0c1fe74efd1c67663cf6a227a98418278061ddad90bb448d17d1834d64ee3d508ea31fef27e2c529de9f46ec71769725cb8c61252a6aba62abb408 SHA512 ec33e4c178f8f13c80822568cd531d06d616e1c6484ba20741aff4c65b6deb439cdd1f1c205a1b82a6d8873e38145f6ee3624303fd703ab577d09557a26f5177 -EBUILD ninja-1.11.1-r3.ebuild 2699 BLAKE2B aa8a3d1a893ea4a1130c2658a1785d951411f37a23ef4443a97514dd82fbf9c3c3e2ba5e982074be8ba8c30c6be4ccfe4006048f868f70651994f3614b55c0dd SHA512 019bae6f9580ef5c4bbc9c6c9300df60ba88b1717b9b89b695e40ffb8a334699c98263fc8691ef7f95c84a16f2e07e41c43dc9109baef6e2b6d502bc96a8ce6e -EBUILD ninja-1.11.1-r4.ebuild 2409 BLAKE2B 58291c8571d0c167dbcc15129849ab879158e74d65f19757ccdf24ffec8731e101d9043122474e0fb96bb2ca0f13dd2bf6bc1873f03be06dbf8f3c0abf28e951 SHA512 050421b837e12b8a2cd03f4bf83cbfa5c5c9623dea85f87945faef884ac4f118fbe193faf5302212428dcfe8ce569b416da3c033994521e019d8d3f3d14f24e4 -EBUILD ninja-9999.ebuild 2409 BLAKE2B 58291c8571d0c167dbcc15129849ab879158e74d65f19757ccdf24ffec8731e101d9043122474e0fb96bb2ca0f13dd2bf6bc1873f03be06dbf8f3c0abf28e951 SHA512 050421b837e12b8a2cd03f4bf83cbfa5c5c9623dea85f87945faef884ac4f118fbe193faf5302212428dcfe8ce569b416da3c033994521e019d8d3f3d14f24e4 -MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880 diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch deleted file mode 100644 index 0c4ef2813bb7..000000000000 --- a/dev-util/ninja/files/ninja-cflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Thu, 19 Mar 2020 11:21:29 -0400 -Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags - ---- - configure.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 7d8ce90..7566147 100755 ---- a/configure.py -+++ b/configure.py -@@ -344,8 +344,6 @@ else: - if options.debug: - cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC'] - cflags.remove('-fno-rtti') # Needed for above pedanticness. -- else: -- cflags += ['-O2', '-DNDEBUG'] - try: - proc = subprocess.Popen( - [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null', --- -2.25.1 - diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml deleted file mode 100644 index 674485d1018e..000000000000 --- a/dev-util/ninja/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <maintainer type="project"> - <email>chromium@gentoo.org</email> - <name>Chromium in Gentoo Project</name> - </maintainer> - <upstream> - <remote-id type="github">ninja-build/ninja</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/ninja/ninja-1.11.1-r2.ebuild b/dev-util/ninja/ninja-1.11.1-r2.ebuild deleted file mode 100644 index 0cb89335a647..000000000000 --- a/dev-util/ninja/ninja-1.11.1-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 2012-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -IUSE="doc emacs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - append-lfs-flags - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - edo ./ninja -v ninja_test - edo ./ninja_test - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - dobin ninja - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/ninja/ninja-1.11.1-r3.ebuild b/dev-util/ninja/ninja-1.11.1-r3.ebuild deleted file mode 100644 index 2ca427037c35..000000000000 --- a/dev-util/ninja/ninja-1.11.1-r3.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2012-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -IUSE="doc emacs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" -PDEPEND="app-alternatives/ninja" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - append-lfs-flags - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - edo ./ninja -v ninja_test - edo ./ninja_test - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - newbin ninja ninja-reference - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then - ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/ninja/ninja-1.11.1-r4.ebuild b/dev-util/ninja/ninja-1.11.1-r4.ebuild deleted file mode 100644 index 4a9cf1f32132..000000000000 --- a/dev-util/ninja/ninja-1.11.1-r4.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2012-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -PDEPEND=" - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - append-lfs-flags - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - edo ./ninja -v ninja_test - edo ./ninja_test - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - newbin ninja ninja-reference - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja -} - -pkg_postinst() { - if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then - ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die - fi -} diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild deleted file mode 100644 index 4a9cf1f32132..000000000000 --- a/dev-util/ninja/ninja-9999.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2012-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -PDEPEND=" - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - append-lfs-flags - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - edo ./ninja -v ninja_test - edo ./ninja_test - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - newbin ninja ninja-reference - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja -} - -pkg_postinst() { - if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then - ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die - fi -} diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest deleted file mode 100644 index 1ed454c01d08..000000000000 --- a/dev-util/samurai/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb -DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225 -EBUILD samurai-1.2-r2.ebuild 749 BLAKE2B fd215292da69e3afa669e0c51925ea53bd71c81267bde9ac80bd6a55cda1296a3832eae7d59c47ab2ca7472dc7a38948e182abe5e701264bcf5b58a227842dff SHA512 c1d98d5832894a25929e52373dd4596256b283cbd597ea3515f6c4a00c8f17b1fee4e5235e968de122959ecbd63833664d7e89ecf6f08843d9420f048866cad9 -EBUILD samurai-9999.ebuild 667 BLAKE2B d7cd61d295ddd710163d362dd208643574b0784fd1ff77ab6010a72a2fc6ba6ddf9b0f8cc0bca94444899401e7c6c07ac377ebce22827787b5682011456b480e SHA512 dc94ed93d609f510f30d0b15d98fab58da752d08301527b239d693c003a33dae86cbbb45ac16b3b41192b259d3b5df9882001fc0371227dc5cd60d95bb4bd44b -MISC metadata.xml 454 BLAKE2B b3f71bd78021685a69254816df743ace390d3aadeaaf9adb1cdeb5f7c3f567623b863fe87b7b230e45efd65bb74b306e0615081f14d396882197c178eb2f77e7 SHA512 527fa97c53904b68ef8f182d6faf8c18116bf3b60099a1b0152a7326cbb372130bd2de0fda38c7ec66dac6d10dba9af29d50d1b98a12999108eab90cd5ed1b79 diff --git a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch deleted file mode 100644 index 76ffc8cd350f..000000000000 --- a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch +++ /dev/null @@ -1,60 +0,0 @@ -CVE-2021-30218 + CVE-2021-30219 -Bug: https://bugs.gentoo.org/786951 - -Upstream-Commit: https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918 -From e84b6d99c85043fa1ba54851ee500540ec206918 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Fri, 2 Apr 2021 17:27:48 -0700 -Subject: [PATCH] util: Check for NULL string in writefile - -This check was there previously, but was removed in f549b757 with -the addition of a check during parse that every rule has rspfile -if and only if it has rspfile_content. However, this fails to -consider the possibility of those variables coming from the edge -or global environment. So, re-add the check. - -Fixes #67 (https://github.com/michaelforney/samurai/issues/67). ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index ea5c3ce..2a59881 100644 ---- a/util.c -+++ b/util.c -@@ -258,7 +258,7 @@ writefile(const char *name, struct string *s) - return -1; - } - ret = 0; -- if (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0) { -+ if (s && (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0)) { - warn("write %s:", name); - ret = -1; - } -Upstream-Commit: https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655 -From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 4 Apr 2021 03:50:09 -0700 -Subject: [PATCH] parse: Check for non-empty command/rspfile/rspfile_content - -This matches ninja behavior and prevents the possibility of a rule -with an empty (NULL) command string. - -Fixes #68 (https://github.com/michaelforney/samurai/issues/68). ---- - parse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/parse.c b/parse.c -index f79a5ee..b4b98a1 100644 ---- a/parse.c -+++ b/parse.c -@@ -42,6 +42,8 @@ parserule(struct scanner *s, struct environment *env) - var = scanname(s); - parselet(s, &val); - ruleaddvar(r, var, val); -+ if (!val) -+ continue; - if (strcmp(var, "command") == 0) - hascommand = true; - else if (strcmp(var, "rspfile") == 0) diff --git a/dev-util/samurai/metadata.xml b/dev-util/samurai/metadata.xml deleted file mode 100644 index f797645e008e..000000000000 --- a/dev-util/samurai/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>orbea@riseup.net</email> - <name>orbea</name> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>sam@gentoo.org</email> - <name>Sam James</name> - </maintainer> - <upstream> - <remote-id type="github">michaelforney/samurai</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/samurai/samurai-1.2-r2.ebuild b/dev-util/samurai/samurai-1.2-r2.ebuild deleted file mode 100644 index d6584ed27041..000000000000 --- a/dev-util/samurai/samurai-1.2-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="ninja-compatible build tool written in C" -HOMEPAGE="https://github.com/michaelforney/samurai" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/michaelforney/samurai.git" -else - SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86" -fi - -LICENSE="ISC Apache-2.0 MIT" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${P}-null_pointer_fix.patch" # 786951 -) - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc README.md -} diff --git a/dev-util/samurai/samurai-9999.ebuild b/dev-util/samurai/samurai-9999.ebuild deleted file mode 100644 index ddd44b78fab1..000000000000 --- a/dev-util/samurai/samurai-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="ninja-compatible build tool written in C" -HOMEPAGE="https://github.com/michaelforney/samurai" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/michaelforney/samurai.git" -else - SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="ISC Apache-2.0 MIT" -SLOT="0" - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc README.md -} diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest deleted file mode 100644 index 01a8e6315425..000000000000 --- a/dev-util/valgrind/Manifest +++ /dev/null @@ -1,20 +0,0 @@ -AUX valgrind-3.13.0-malloc.patch 1024 BLAKE2B 3917fe49e5b7f8f678801edd3236b76fbc3eaf790bc19db7a1055cd949df802fc7612b8ec8fb40371814790d24f15fc2cdfd5349297ed5b48e28d3224bb2d170 SHA512 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 -AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6 -AUX valgrind-3.20.0-gcc-13.patch 1181 BLAKE2B a7cdca7b99e822444ab3c453efba979a341c31ad0882a8a8232ba96af4ccc94277b142a833435afc911b06b743c5bc6e7bd126b7f65246308147130ab0ee86c4 SHA512 c4d14851f7ea41d8b3f8391f3e2c0fd72afae0944594d126bf2d3dbbf65fd3cd5fdf5303c4b7b3f40c5fe48f0e965dcd6265d268b8e3483c9354ede8e5c53af5 -AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729 -AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23 -AUX valgrind-3.21.0-glibc-2.34-suppressions.patch 4800 BLAKE2B ea36d61be93ca26b301f78bd4f1ea8b7f6769253101858bf27ae5ffddef5375ed1c0627ec648b7310e43a9546ae2a3c0c28ec4e6e6947e68ab8a2f0b0fa0fe27 SHA512 c21d0b7dbe91683669e92cc9f93d0912987b5b241116df08a48eaf422d9961f2c83398a2d8610c22d8cbf5bddf6f1ab8e08c3cdd1ed77b51269f3584cd8a2622 -AUX valgrind-3.21.0-memcpy-fortify_source.patch 1058 BLAKE2B df5e131dd7c01f0d7cf0b2c5b3ed484d1cebf34fd8f5ae10d37aea36e17903db9f243ccf35962c7b1da225cb8b413810911eae55eddadd5aeaafef3afb2d5f56 SHA512 e52233d187c7594773e00d1531b4488c684e8764b715ea0ec7ec24380c4ac8c1ddf104eb35eb3cc0fdc5f301a1365989bb0f1690b25947935e7c9247364d3c2d -AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3 -DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b -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.tar.bz2 16565502 BLAKE2B 80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514 SHA512 2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777 -DIST valgrind-3.22.0.tar.bz2.asc 488 BLAKE2B 9e4d4cfac4dcc09bb62beeaa7b9f78bfafd0a6ae8d63e423ff81b7b8f5444a301e4c3030a241644c8070c36ee040832ce99f444678f22611457e325ceae18dd1 SHA512 c2317db564ef816d2b5d1a7f2f680dc1c6ea05abbffde660587946c986af179ea7ca2314d94c792f63f3043b6a44819ddf5661fd60ec2454a2c562e7d2711b36 -EBUILD valgrind-3.20.0-r2.ebuild 4290 BLAKE2B 05b5383ec2b1f8db878575fa64946d58c584991909ff164240e5511899f6db83233ab28a0513dc2c61b32302a4707261cf256f77afee09da534a23888b1ccacb SHA512 1ae8b9e5c8cebe0aabc0c73f32b2b75e54052323a0c222bf1bfde63776744d07984835be409f1111253814984bdae026231169556bafff1cb588167665bcad21 -EBUILD valgrind-3.21.0-r1.ebuild 4077 BLAKE2B 95e606463e7b28052371f64fe66809abae55313b0d248ffb3ef6ccfeb3eba3d2d19384bd878cae037307d5a98e2a2a12920dbd236b973881dbfb6b5682e6a8fe SHA512 0102ef6a71a4b190a40442a7b51134ab72b58c4be24bd98e6883a6d31b638ac2a17a91bff8c3da91628eeef0cece4e287c9f5b9f41b03879ab784c9cac2eee63 -EBUILD valgrind-3.21.0-r2.ebuild 4449 BLAKE2B 464adde42c9ed8b8bf2081b216cacff02058799de7ffb8f58bb024a5625da7510e9a9e0dc3b2739ffd9a41b940600d6114e74faeda848a3ec1ea2440fe2a7d7e SHA512 69cfd15bb6f3a4a7d24e136f81839b4dfe91928c7f39dbb771937d7b1ba28f412120cf12b2dbaf071e255cd01a88b85b093e1fa1f224dea7482b47432e810d4b -EBUILD valgrind-3.22.0.ebuild 4787 BLAKE2B bcd9649b097558af58249da81923d84d58b13b1f4c0f0db166e10981b1910db6133f68d656bfb920d72282afd85cac474cc397be99280c48aa2ecffa8b1f2019 SHA512 1f7f48483368baacf8541641079341dfa84dd29a6cfa1c4e41bb9f3c098d14fc6944b5bed6bfc691a91ca7ec5ba0bc5b70a173351ee40f73d2a2902f10cea22a -EBUILD valgrind-9999.ebuild 4787 BLAKE2B bcd9649b097558af58249da81923d84d58b13b1f4c0f0db166e10981b1910db6133f68d656bfb920d72282afd85cac474cc397be99280c48aa2ecffa8b1f2019 SHA512 1f7f48483368baacf8541641079341dfa84dd29a6cfa1c4e41bb9f3c098d14fc6944b5bed6bfc691a91ca7ec5ba0bc5b70a173351ee40f73d2a2902f10cea22a -MISC metadata.xml 1123 BLAKE2B 17b5501b05acd9384ab57a15018bc0d1ede50d7b5b9a5c38fcce816f68e8946010bc86233a197df89ad208957f90ab643942b7e1a3ceaa6e8d456320828b84e8 SHA512 a8c32063f3afd28c4a2d5c5c0f437c08772e822aaed4feb71f79e0f5a6cf81530d056bd8ae2ef73ac70792bd78fc095c069ef0d4304ff0a1c365f289d1191fe1 diff --git a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch deleted file mode 100644 index d0eb795b84be..000000000000 --- a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c -+++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c -@@ -765,13 +765,15 @@ static void init(void); - DO_INIT; \ - MALLOC_TRACE("realloc(%p,%llu)", ptrV, (ULong)new_size ); \ - \ -- if (ptrV == NULL) \ -- /* We need to call a malloc-like function; so let's use \ -- one which we know exists. */ \ -- return VG_REPLACE_FUNCTION_EZU(10010,VG_Z_LIBC_SONAME,malloc) \ -- (new_size); \ -+ if (ptrV == NULL) { \ -+ TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED(new_size); \ -+ v = (void*)VALGRIND_NON_SIMD_CALL1( info.tl_malloc, new_size ); \ -+ MALLOC_TRACE(" = %p\n", v ); \ -+ return v; \ -+ } \ - if (new_size <= 0) { \ -- VG_REPLACE_FUNCTION_EZU(10050,VG_Z_LIBC_SONAME,free)(ptrV); \ -+ if (ptrV != NULL) \ -+ VALGRIND_NON_SIMD_CALL1( info.tl_free, ptrV ); \ - MALLOC_TRACE(" = 0\n"); \ - return NULL; \ - } \ diff --git a/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch b/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch deleted file mode 100644 index 44176658df74..000000000000 --- a/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch +++ /dev/null @@ -1,22 +0,0 @@ -From beab8d9f8d65230567270331017184c8762faa42 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 4 Nov 2019 09:12:16 -0800 -Subject: [PATCH] Build ldst_multiple test with -fno-pie - -Bug: https://bugs.gentoo.org/685070 ---- - none/tests/ppc32/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am -index 11697c99a..222efd3f2 100644 ---- a/none/tests/ppc32/Makefile.am -+++ b/none/tests/ppc32/Makefile.am -@@ -156,3 +156,4 @@ test_isa_2_07_part2_LDADD = -lm - test_tm_LDADD = -lm - test_touch_tm_LDADD = -lm - -+ldst_multiple_CFLAGS = $(AM_CFLAGS) -fno-pie --- -2.23.0 - diff --git a/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch b/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch deleted file mode 100644 index 3d3644f85fc1..000000000000 --- a/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://sourceware.org/git/?p=valgrind.git;a=commit;h=dee222c6e818ca43ac45952fc8a020f445d98781 -https://sourceware.org/git/?p=valgrind.git;a=commit;h=3155bacf26237beb65edb4a572402492b2f1b050 - -From dee222c6e818ca43ac45952fc8a020f445d98781 Mon Sep 17 00:00:00 2001 -From: Paul Floyd <pjfloyd@wanadoo.fr> -Date: Fri, 27 Jan 2023 08:30:41 +0100 -Subject: [PATCH] Bug 464859 - Build failures with GCC-13 (drd tsan_unittest) - -Patch submitted by - Khem Raj <raj.khem@gmail.com> ---- a/drd/tests/tsan_thread_wrappers_pthread.h -+++ b/drd/tests/tsan_thread_wrappers_pthread.h -@@ -55,6 +55,7 @@ - #define NO_TLS - #endif - -+#include <cstdint> - #include <string> - using namespace std; - --- -2.31.1 - -From 3155bacf26237beb65edb4a572402492b2f1b050 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Sat, 28 Jan 2023 21:53:44 +0100 -Subject: [PATCH] tsan_thread_wrappers_pthread.h: Only include cstdint for - C++11 - -Fixes build on older g++. ---- a/drd/tests/tsan_thread_wrappers_pthread.h -+++ b/drd/tests/tsan_thread_wrappers_pthread.h -@@ -55,7 +55,9 @@ - #define NO_TLS - #endif - -+#if __cplusplus >= 201103L - #include <cstdint> -+#endif - #include <string> - using namespace std; - --- -2.31.1 diff --git a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch deleted file mode 100644 index 6ede22f8b5ec..000000000000 --- a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=435441 - -From 460d0c9a6c27edfffed8ced623cecf64466619f2 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 4 Nov 2021 14:26:40 -0700 -Subject: [PATCH] Bug 435441 - Handle weak symbols as global for redirection - -Weak symbols are global but with lower precedence, so they should -be handled the same way as global symbols during malloc replacement. - -This fixes valgrind on musl 1.2.2 when it is not patched with a -soname (as is done on Alpine Linux). - -https://bugs.kde.org/show_bug.cgi?id=435441 ---- a/coregrind/m_debuginfo/readelf.c -+++ b/coregrind/m_debuginfo/readelf.c -@@ -429,7 +429,8 @@ Bool get_elf_symbol_info ( - } - # endif - -- if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL) { -+ if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL -+ || ELFXX_ST_BIND(sym->st_info) == STB_WEAK) { - *is_global_out = True; - } - --- -2.32.0 - - diff --git a/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch b/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch deleted file mode 100644 index 01d51ba5f9ad..000000000000 --- a/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=462007 -https://sourceware.org/git/?p=valgrind.git;a=commit;h=0811a612dd7ce0c02a5dd699b34e660c742df8fe - -From 0811a612dd7ce0c02a5dd699b34e660c742df8fe Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Fri, 18 Nov 2022 20:12:06 +0100 -Subject: [PATCH 1/1] Implicit int in none/tests/faultstatus.c - -There is a definition in faultstatus.c that is not accepted by -C99 compilers (implicit ints were removed in that language revision). - -https://bugs.kde.org/show_bug.cgi?id=462007 ---- a/none/tests/faultstatus.c -+++ b/none/tests/faultstatus.c -@@ -190,7 +190,7 @@ int main() - return 0; - } - --static volatile s_zero; -+static volatile int s_zero; - - static int zero() - { diff --git a/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch b/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch deleted file mode 100644 index c4111326cfa2..000000000000 --- a/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch +++ /dev/null @@ -1,197 +0,0 @@ -commit e04914e10126d3a8de13302e958bbfd5e83a6637 -Author: Romain Geissler <romain.geissler@amadeus.com> -Date: Mon Jan 30 16:09:47 2023 +0000 - - Fragile temporary fix for https://bugs.kde.org/show_bug.cgi?id=464671: avoid using @GLIBC_VERSION@ with our recent toolchains. - - This is fragile as it might a bit too many things (especially ld*.so, which maybe shall be written "ld-linux-*.so" to be a bit more robust) - and also it doesn't work for glibc < 2.34. - - Ideally something similar to GLIBC_LIBC_PATH shall be introduced for ld.so and libdl.so, so that - it covers both glibc < 2.34 and glibc >= 2.34. - ---- a/glibc-2.X.supp.in -+++ b/glibc-2.X.supp.in -@@ -39,74 +39,74 @@ - { - dl-hack3-cond-1 - Memcheck:Cond -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* - } - { - dl-hack3-cond-2 - Memcheck:Cond -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:@GLIBC_LIBC_PATH@ - } - { - dl-hack3-cond-3 - Memcheck:Cond -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/libc-@GLIBC_VERSION@*.so* -- obj:*/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ - } - { - dl-hack3-cond-4 - Memcheck:Cond -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:@GLIBC_LIBC_PATH@ - } - - { - dl-hack4-64bit-addr-1 - Memcheck:Addr8 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* - } - { - dl-hack4-64bit-addr-2 - Memcheck:Addr8 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:@GLIBC_LIBC_PATH@ - } - { - dl-hack4-64bit-addr-3 - Memcheck:Addr8 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so* -- obj:*/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so* -+ obj:*/lib*/ld*.so* -+ obj:@GLIBC_LIBC_PATH@ - } - - { - dl-hack5-32bit-addr-1 - Memcheck:Addr4 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld*.so -+ obj:*/lib*/ld*.so -+ obj:*/lib*/ld*.so - } - { - dl-hack5-32bit-addr-3 - Memcheck:Addr4 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -- obj:*/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld*.so -+ obj:*/lib*/ld*.so -+ obj:@GLIBC_LIBC_PATH@ - } - { - dl-hack5-32bit-addr-4 - Memcheck:Addr4 -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -- obj:*/lib*/libdl-@GLIBC_VERSION@*.so* -- obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld*.so -+ obj:@GLIBC_LIBC_PATH@ -+ obj:*/lib*/ld*.so - } - - -@@ -124,7 +124,7 @@ - glibc-2.5.x-on-SUSE-10.2-(PPC)-2a - Memcheck:Cond - fun:index -- obj:*ld-@GLIBC_VERSION@.*.so -+ obj:*/lib*/ld*.so* - } - { - glibc-2.5.x-on-SuSE-10.2-(PPC)-2b -@@ -136,7 +136,7 @@ - glibc-2.5.5-on-SuSE-10.2-(PPC)-2c - Memcheck:Addr4 - fun:index -- obj:*ld-@GLIBC_VERSION@.*.so -+ obj:*/lib*/ld*.so* - } - { - glibc-2.3.5-on-SuSE-10.1-(PPC)-3 -@@ -149,9 +149,9 @@ - { - glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86) - Memcheck:Addr4 -- obj:*/lib/ld-@GLIBC_VERSION@*.so -- obj:*/lib/ld-@GLIBC_VERSION@*.so -- obj:*/lib/ld-@GLIBC_VERSION@*.so -+ obj:*/lib/ld*.so -+ obj:*/lib/ld*.so -+ obj:*/lib/ld*.so - } - - { -@@ -168,9 +168,9 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:__sendto_nocancel -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ - } - { - glibc24-64bit-padding-1c -@@ -180,7 +180,7 @@ - fun:__nscd_get_map_ref - fun:nscd_get*_r - fun:*nscd* -- obj:/*libc-@GLIBC_VERSION@*.so -+ obj:@GLIBC_LIBC_PATH@ - } - - -@@ -199,18 +199,18 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ - } - { - X11-64bit-padding-4b - Memcheck:Param - socketcall.send(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -- obj:/*libc-@GLIBC_VERSION@*.so -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ -+ obj:@GLIBC_LIBC_PATH@ - } - - ##----------------------------------------------------------------------## diff --git a/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch b/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch deleted file mode 100644 index 87acc9ff9f55..000000000000 --- a/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch +++ /dev/null @@ -1,26 +0,0 @@ -Avoid false positives w/ overlapping memcpy args with _FORTIFY_SOURCE's -memcpy_chk. - -https://src.fedoraproject.org/rpms/valgrind/raw/rawhide/f/valgrind-3.21.0-no-memcpy-replace-check.patch -https://bugs.kde.org/show_bug.cgi?id=402833 -https://bugs.kde.org/show_bug.cgi?id=453084 ---- a/shared/vg_replace_strmem.c -+++ b/shared/vg_replace_strmem.c -@@ -1128,7 +1128,7 @@ static inline void my_exit ( int x ) - MEMMOVE_OR_MEMCPY(20181, soname, fnname, 0) - - #define MEMCPY(soname, fnname) \ -- MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1) -+ MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0) /* See KDE bug #402833 */ - - #if defined(VGO_linux) - /* For older memcpy we have to use memmove-like semantics and skip -@@ -1714,8 +1714,6 @@ static inline void my_exit ( int x ) - RECORD_COPY(len); \ - if (len == 0) \ - return dst; \ -- if (is_overlap(dst, src, len, len)) \ -- RECORD_OVERLAP_ERROR("memcpy_chk", dst, src, len); \ - if ( dst > src ) { \ - d = (HChar *)dst + len - 1; \ - s = (const HChar *)src + len - 1; \ diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch deleted file mode 100644 index 860e09c86ed3..000000000000 --- a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am ---- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400 -+++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500 -@@ -7,9 +7,6 @@ - CC = $(MPI_CC) - DEFS = - DEFAULT_INCLUDES = --CPPFLAGS = --CFLAGS = --LDFLAGS = - - EXTRA_DIST = \ - mpiwrap_type_test.c diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml deleted file mode 100644 index e8e4b8fe98e0..000000000000 --- a/dev-util/valgrind/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>toolchain@gentoo.org</email> - <name>Gentoo Toolchain Project</name> - </maintainer> - <longdescription> - Valgrind is a GPL'd tool to help you find memory-management problems - in your programs. When a program is run under Valgrind's supervision, - all reads and writes of memory are checked, and calls to - malloc/new/free/delete are intercepted. As a result, Valgrind can - detect problems such as - - - Use of uninitialised memory - - Reading/writing memory after it has been free'd - - Reading/writing off the end of malloc'd blocks - - Reading/writing inappropriate areas on the stack - - Memory leaks -- where pointers to malloc'd blocks are lost forever - - Passing of uninitialised and/or unaddressible memory to system calls - - Mismatched use of malloc/new/new [] vs free/delete/delete [] - - Some abuses of the POSIX Pthreads API - </longdescription> - <upstream> - <remote-id type="cpe">cpe:/a:valgrind:valgrind</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild deleted file mode 100644 index 4d57872a0984..000000000000 --- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 - 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" -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}"/${P}-tests-clang16.patch - "${FILESDIR}"/${P}-gcc-13.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 use elibc_musl ; then - PATCHES+=( - "${FILESDIR}"/${PN}-3.13.0-malloc.patch - "${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch - ) - fi - - 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=() - - # 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_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-3.21.0-r1.ebuild b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild deleted file mode 100644 index a7b14f025de9..000000000000 --- a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 - 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" -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 -) - -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=() - - # 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_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-3.21.0-r2.ebuild b/dev-util/valgrind/valgrind-3.21.0-r2.ebuild deleted file mode 100644 index 63fc631ce1d1..000000000000 --- a/dev-util/valgrind/valgrind-3.21.0-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# 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=/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" -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=() - - # 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_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-3.22.0.ebuild b/dev-util/valgrind/valgrind-3.22.0.ebuild deleted file mode 100644 index 08632de09fad..000000000000 --- a/dev-util/valgrind/valgrind-3.22.0.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# 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=/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 -) - -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 - # -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 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 deleted file mode 100644 index 08632de09fad..000000000000 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# 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=/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 -) - -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 - # -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 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" -} |