diff options
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/Manifest.gz | bin | 10644 -> 10637 bytes | |||
-rw-r--r-- | sys-devel/mold/Manifest | 8 | ||||
-rw-r--r-- | sys-devel/mold/metadata.xml | 3 | ||||
-rw-r--r-- | sys-devel/mold/mold-1.4.2.ebuild | 92 | ||||
-rw-r--r-- | sys-devel/mold/mold-1.5.1.ebuild | 96 | ||||
-rw-r--r-- | sys-devel/mold/mold-9999.ebuild | 10 |
6 files changed, 6 insertions, 203 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 15ebe3ac903b..62bbec0dd3ab 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest index 73656fe10d16..f0261cff8baf 100644 --- a/sys-devel/mold/Manifest +++ b/sys-devel/mold/Manifest @@ -1,9 +1,5 @@ AUX mold-1.4.1-tbb-flags-stripping.patch 1141 BLAKE2B c53b46b509ccc1adb5700ee12270bf15358eca2869f0ec90e686cf1c4218e912dbf151e449220be1cc206a4eb69032619897674a4ecace6f98fce3ea889a883d SHA512 2691bde934649178e4ae45d5bc4554d6c997d10679cf0d575e4be6ecb2fca772caf9a82cdbbf61d00e0d986b3dbfc811a61800da0def1c2aefdf3c64553107d6 -DIST mold-1.4.2.tar.gz 6287845 BLAKE2B ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd SHA512 17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1 -DIST mold-1.5.1.tar.gz 8254552 BLAKE2B 1a5f8099df3cf7a6008632afed2aa106a54fa0c6628302f13586884fd1a37705a2bfc9ddc395261c04d53fe9de679b5afc7e052dcfe37894444b024670f44307 SHA512 340a45c5190ce5ba87eaa05238da7c70400bf4a2788a095935b9675593078ad76bbd95e67aa36b3ec683428724a3c6bc27c7e0a69569afce461682dc4bd16b10 DIST mold-1.6.0.tar.gz 8270834 BLAKE2B e9da062ab9871db35322cd516197e6e8172bee3a146ba32cde65976da2fb4cff0090ad62f06e25da9baed146c6defbd93d8704bd2156dcfb581ec247c45a2e12 SHA512 dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857 -EBUILD mold-1.4.2.ebuild 2247 BLAKE2B 8e6a4ed72fcd26918269414cb41284b6bd2af396e2faacf4248dfccc23521aba1fc736ebf6c257800c24434b8c0dee1803855ec6e302a514371e00e0819fcadb SHA512 be169d49593c519ea048647cbda871c317f5d72f4021483c7795b70c92a0f0c845ed2d517dd69dbef90e129ecf89dd27612c65f611d736bb7be5886025f5ed17 -EBUILD mold-1.5.1.ebuild 2329 BLAKE2B 297f6ff8b28871d7e318dfba68d325ad192b263eb68cb43f86782380a0584a387439ff8d2406e1d313e1f0ad1e9513deffed0d9ffc6f46bdcd370e10b1bcf45a SHA512 6340cdaf7b90cb5f7f3638eb41683df13c7b47cacaa453250c8c892c84aa6a75fde5036e5ab5587a6c3343332a24dd24344dd720f2cd622f9a9712fb9a1cfa08 EBUILD mold-1.6.0-r1.ebuild 2251 BLAKE2B 93c90b774d6789100bf1ed3ee782d02e0110d3da23f5ebb6779c4cb90817f557dfcdd9d2aba36f706ec00b327845779a01d23da787effd798b829f0fa06ac849 SHA512 6d919f5f2402009399ee892e1df3a60679d3fffde9cf36b2d07ef11bc37099096c27216efa24813f22d90fc69f0637bd81de4fa389a81bd9165a80a5491f8857 -EBUILD mold-9999.ebuild 2329 BLAKE2B 297f6ff8b28871d7e318dfba68d325ad192b263eb68cb43f86782380a0584a387439ff8d2406e1d313e1f0ad1e9513deffed0d9ffc6f46bdcd370e10b1bcf45a SHA512 6340cdaf7b90cb5f7f3638eb41683df13c7b47cacaa453250c8c892c84aa6a75fde5036e5ab5587a6c3343332a24dd24344dd720f2cd622f9a9712fb9a1cfa08 -MISC metadata.xml 532 BLAKE2B 567b47e19d44fabf45a4e1153adb53618c78e89adf580c6350f525fd7596e820608571f8f0920b844702c67192dbbb0122002a0a29125ecb31617ae975d52d09 SHA512 1893b76fc3c4ed0889915700661150bb051b92c6a3e55c606e8c4432148f52d8862e5b4968a0c0474630c0f014018a211b9588f71e68c75ad745d688c6448534 +EBUILD mold-9999.ebuild 2251 BLAKE2B 93c90b774d6789100bf1ed3ee782d02e0110d3da23f5ebb6779c4cb90817f557dfcdd9d2aba36f706ec00b327845779a01d23da787effd798b829f0fa06ac849 SHA512 6d919f5f2402009399ee892e1df3a60679d3fffde9cf36b2d07ef11bc37099096c27216efa24813f22d90fc69f0637bd81de4fa389a81bd9165a80a5491f8857 +MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6 diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml index 6841ad2ee625..f8a85299d5bb 100644 --- a/sys-devel/mold/metadata.xml +++ b/sys-devel/mold/metadata.xml @@ -12,7 +12,4 @@ <upstream> <remote-id type="github">rui314/mold</remote-id> </upstream> - <use> - <flag name="system-tbb">Use <pkg>dev-cpp/tbb</pkg> package instead of vendored copy</flag> - </use> </pkgmetadata> diff --git a/sys-devel/mold/mold-1.4.2.ebuild b/sys-devel/mold/mold-1.4.2.ebuild deleted file mode 100644 index 1a83cf4d004e..000000000000 --- a/sys-devel/mold/mold-1.4.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A Modern Linker" -HOMEPAGE="https://github.com/rui314/mold" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/rui314/mold.git" - inherit git-r3 -else - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~riscv" -fi - -# mold (AGPL-3) -# - xxhash (BSD-2) -# - tbb (Apache-2.0) -LICENSE="AGPL-3 Apache-2.0 BSD-2" -SLOT="0" -IUSE="system-tbb" - -RDEPEND=" - sys-libs/zlib - system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) - !kernel_Darwin? ( - >=dev-libs/mimalloc-2:= - dev-libs/openssl:= - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - # https://bugs.gentoo.org/865837 - "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch -) - -pkg_pretend() { - # Requires a c++20 compiler, see #831473 - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then - die "${PN} needs at least gcc 10" - elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then - die "${PN} needs at least clang 12" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Needs unpackaged dwarfdump - rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - - # Heavy tests, need qemu - rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die - rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die - - # Sandbox sadness - rm test/elf/run.sh || die - sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \ - test/elf/mold-wrapper{,2}.sh || die - - # static-pie tests require glibc built with static-pie support - if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then - rm test/elf/{,ifunc-}static-pie.sh || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMOLD_ENABLE_QEMU_TESTS=OFF - -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. - -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb) - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/${PN} - dolib.so "${BUILD_DIR}"/${PN}-wrapper.so - - dodoc docs/{design,execstack}.md - doman docs/${PN}.1 - - dosym ${PN} /usr/bin/ld.${PN} - dosym ${PN} /usr/bin/ld64.${PN} - dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld -} diff --git a/sys-devel/mold/mold-1.5.1.ebuild b/sys-devel/mold/mold-1.5.1.ebuild deleted file mode 100644 index 34d7e10e3bf1..000000000000 --- a/sys-devel/mold/mold-1.5.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A Modern Linker" -HOMEPAGE="https://github.com/rui314/mold" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/rui314/mold.git" - inherit git-r3 -else - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~riscv" -fi - -# mold (AGPL-3) -# - xxhash (BSD-2) -# - tbb (Apache-2.0) -LICENSE="AGPL-3 Apache-2.0 BSD-2" -SLOT="0" -IUSE="system-tbb" - -RDEPEND=" - app-arch/zstd:= - sys-libs/zlib - system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) - !kernel_Darwin? ( - >=dev-libs/mimalloc-2:= - dev-libs/openssl:= - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - # https://bugs.gentoo.org/865837 - "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch -) - -pkg_pretend() { - # Requires a c++20 compiler, see #831473 - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then - die "${PN} needs at least gcc 10" - elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then - die "${PN} needs at least clang 12" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Needs unpackaged dwarfdump - rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - - # Heavy tests, need qemu - rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die - rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die - - # Sandbox sadness - rm test/elf/run.sh || die - sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \ - test/elf/mold-wrapper{,2}.sh || die - - # static-pie tests require glibc built with static-pie support - if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then - rm test/elf/{,ifunc-}static-pie.sh || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMOLD_ENABLE_QEMU_TESTS=OFF - -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. - -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb) - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/${PN} - - # https://bugs.gentoo.org/872773 - insinto /usr/$(get_libdir)/mold - doins "${BUILD_DIR}"/${PN}-wrapper.so - - dodoc docs/{design,execstack}.md - doman docs/${PN}.1 - - dosym ${PN} /usr/bin/ld.${PN} - dosym ${PN} /usr/bin/ld64.${PN} - dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld -} diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild index 34d7e10e3bf1..45c7fd085eb8 100644 --- a/sys-devel/mold/mold-9999.ebuild +++ b/sys-devel/mold/mold-9999.ebuild @@ -12,20 +12,18 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~riscv ~x86" fi # mold (AGPL-3) # - xxhash (BSD-2) -# - tbb (Apache-2.0) -LICENSE="AGPL-3 Apache-2.0 BSD-2" +LICENSE="AGPL-3 BSD-2" SLOT="0" -IUSE="system-tbb" RDEPEND=" app-arch/zstd:= + >=dev-cpp/tbb-2021.7.0:= sys-libs/zlib - system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= @@ -75,7 +73,7 @@ src_configure() { -DMOLD_ENABLE_QEMU_TESTS=OFF -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb) + -DMOLD_USE_SYSTEM_TBB=ON ) cmake_src_configure } |