From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- sys-libs/Manifest.gz | Bin 14403 -> 14224 bytes sys-libs/compiler-rt-sanitizers/Manifest | 14 +- .../compiler-rt-sanitizers-11.1.0-r1.ebuild | 4 +- .../compiler-rt-sanitizers-12.0.1.ebuild | 4 +- .../compiler-rt-sanitizers-13.0.0-r1.ebuild | 4 +- .../compiler-rt-sanitizers-13.0.0.ebuild | 4 +- .../compiler-rt-sanitizers-13.0.1.9999.ebuild | 4 +- .../compiler-rt-sanitizers-13.0.1_rc1.ebuild | 4 +- .../compiler-rt-sanitizers-14.0.0.9999.ebuild | 4 +- sys-libs/e2fsprogs-libs/Manifest | 2 +- .../e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild | 91 +++++ .../e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild | 93 ----- sys-libs/fortify-headers/Manifest | 2 +- .../fortify-headers/fortify-headers-0.7.ebuild | 2 +- sys-libs/fts-standalone/Manifest | 4 +- .../fts-standalone/fts-standalone-0.2-r1.ebuild | 26 -- .../fts-standalone/fts-standalone-1.2.7.ebuild | 14 +- sys-libs/gdbm/Manifest | 7 - sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch | 12 - sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch | 17 - sys-libs/gdbm/gdbm-1.20.ebuild | 53 --- sys-libs/gdbm/gdbm-1.21.ebuild | 49 --- sys-libs/glibc/Manifest | 4 +- sys-libs/glibc/glibc-2.34-r4.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- sys-libs/ldb/Manifest | 8 +- sys-libs/ldb/ldb-2.3.1.ebuild | 4 +- sys-libs/ldb/ldb-2.3.2.ebuild | 4 +- sys-libs/ldb/ldb-2.4.0-r1.ebuild | 4 +- sys-libs/ldb/ldb-2.4.1.ebuild | 4 +- sys-libs/libcap/Manifest | 7 +- sys-libs/libcap/files/libcap-2.61-Wformat.patch | 25 -- ....61-ignore-RAISE_SETFCAP-install-failures.patch | 24 -- sys-libs/libcap/files/libcap-2.61-no_perl.patch | 57 --- sys-libs/libcap/libcap-2.61.ebuild | 98 ----- sys-libs/libcap/libcap-2.62.ebuild | 2 +- sys-libs/libcxx/Manifest | 12 +- sys-libs/libcxx/libcxx-11.1.0.ebuild | 4 +- sys-libs/libcxx/libcxx-12.0.1.ebuild | 4 +- sys-libs/libcxx/libcxx-13.0.0.ebuild | 4 +- sys-libs/libcxx/libcxx-13.0.1.9999.ebuild | 4 +- sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild | 4 +- sys-libs/libcxx/libcxx-14.0.0.9999.ebuild | 6 +- sys-libs/libcxxabi/Manifest | 12 +- sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild | 4 +- sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild | 4 +- sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild | 4 +- sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild | 4 +- sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild | 4 +- sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild | 9 +- sys-libs/libomp/Manifest | 8 +- sys-libs/libomp/libomp-13.0.0-r1.ebuild | 131 ------- sys-libs/libomp/libomp-13.0.0-r2.ebuild | 131 +++++++ sys-libs/libomp/libomp-13.0.1.9999.ebuild | 2 +- sys-libs/libomp/libomp-13.0.1_rc1.ebuild | 2 +- sys-libs/libomp/libomp-14.0.0.9999.ebuild | 2 +- sys-libs/libselinux/Manifest | 2 +- sys-libs/libselinux/libselinux-3.3.ebuild | 2 +- sys-libs/libsemanage/Manifest | 2 +- sys-libs/libsemanage/libsemanage-3.3.ebuild | 2 +- sys-libs/libsepol/Manifest | 2 +- sys-libs/libsepol/libsepol-3.3.ebuild | 2 +- sys-libs/libutempter/Manifest | 2 +- sys-libs/libutempter/libutempter-1.2.1.ebuild | 7 +- sys-libs/llvm-libunwind/Manifest | 2 +- .../llvm-libunwind-14.0.0.9999.ebuild | 29 +- sys-libs/mtdev/Manifest | 2 +- sys-libs/mtdev/mtdev-1.1.6.ebuild | 4 +- sys-libs/musl-nscd/Manifest | 6 +- sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild | 54 +++ sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild | 54 --- sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild | 52 +++ sys-libs/musl-nscd/musl-nscd-1.1.1.ebuild | 52 --- sys-libs/musl-nscd/musl-nscd-9999.ebuild | 6 +- sys-libs/newlib/Manifest | 2 + sys-libs/newlib/newlib-4.2.0.20211231.ebuild | 154 ++++++++ sys-libs/obstack-standalone/Manifest | 2 +- .../obstack-standalone-1.1.ebuild | 7 +- sys-libs/queue-standalone/Manifest | 2 +- .../queue-standalone-0.1-r1.ebuild | 7 +- sys-libs/rpmatch-standalone/Manifest | 2 +- .../rpmatch-standalone-1.0.ebuild | 5 +- sys-libs/talloc/Manifest | 4 +- sys-libs/talloc/talloc-2.3.2.ebuild | 11 +- sys-libs/talloc/talloc-2.3.3.ebuild | 11 +- sys-libs/tdb/Manifest | 2 +- sys-libs/tdb/tdb-1.4.5.ebuild | 4 +- sys-libs/tevent/Manifest | 4 +- sys-libs/tevent/tevent-0.10.2.ebuild | 6 +- sys-libs/tevent/tevent-0.11.0.ebuild | 6 +- sys-libs/timezone-data/Manifest | 4 +- .../timezone-data/timezone-data-2021a-r1.ebuild | 6 +- sys-libs/timezone-data/timezone-data-2021e.ebuild | 6 +- sys-libs/uclibc-ng/Manifest | 12 - sys-libs/uclibc-ng/files/uclibc-compat-r1.patch | 15 - .../files/uclibc-ng-1.0.30-fix-ld.so.cache.patch | 48 --- sys-libs/uclibc-ng/metadata.xml | 21 -- sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild | 403 --------------------- sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild | 402 -------------------- sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild | 402 -------------------- sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild | 402 -------------------- sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 402 -------------------- sys-libs/zlib-ng/Manifest | 2 + sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 75 ++++ 104 files changed, 730 insertions(+), 2995 deletions(-) create mode 100644 sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild delete mode 100644 sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild delete mode 100644 sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild delete mode 100644 sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch delete mode 100644 sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch delete mode 100644 sys-libs/gdbm/gdbm-1.20.ebuild delete mode 100644 sys-libs/gdbm/gdbm-1.21.ebuild delete mode 100644 sys-libs/libcap/files/libcap-2.61-Wformat.patch delete mode 100644 sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch delete mode 100644 sys-libs/libcap/files/libcap-2.61-no_perl.patch delete mode 100644 sys-libs/libcap/libcap-2.61.ebuild delete mode 100644 sys-libs/libomp/libomp-13.0.0-r1.ebuild create mode 100644 sys-libs/libomp/libomp-13.0.0-r2.ebuild create mode 100644 sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild delete mode 100644 sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild create mode 100644 sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild delete mode 100644 sys-libs/musl-nscd/musl-nscd-1.1.1.ebuild create mode 100644 sys-libs/newlib/newlib-4.2.0.20211231.ebuild delete mode 100644 sys-libs/uclibc-ng/Manifest delete mode 100644 sys-libs/uclibc-ng/files/uclibc-compat-r1.patch delete mode 100644 sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch delete mode 100644 sys-libs/uclibc-ng/metadata.xml delete mode 100644 sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild delete mode 100644 sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild delete mode 100644 sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild delete mode 100644 sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild delete mode 100644 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild create mode 100644 sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index 2bba8da7fc4b..657305a65407 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 01cac0806ef0..33ea3a80ea03 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -8,11 +8,11 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d -EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6054 BLAKE2B 0e7ecc21c987bdb184c18456c2d6482d268b6f04fa8a9e1694e2e4733c0ff5e0f5f93639358b1bb9ede250c1543dd89cdfadf1382aa334a4593b3655f1915c56 SHA512 e13805c26cf03152295f9794468910560932fdcc769a4dd9461f92172a20e41b38b9867d988c82ae7d9516c5f2b18e32d8e14bbbe0702c81b7f222eae51988ab -EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5971 BLAKE2B c71a8e7f9c741b7bb9ce9034312dd3fcea08a2097ec322126efe3ddc9f8d945f9aa02fbf6c0afdd12d19e2ec038e4894d74a149e83caf0aa59fad0cff84c2eee SHA512 9b7ea1e034d0d89cec9d5ff97e2bb34c09303f339c3d4fd4d4f31e2ba4ae7aab1bdcc8201afde8899c87892bdd7022104d90c78b8d4dab5f7c01787c21a41b17 -EBUILD compiler-rt-sanitizers-13.0.0-r1.ebuild 6174 BLAKE2B 75c9d27f6a706353339699716ea645b5312fb85e4c9412a7de0a1c54daf5d9bdb294f7efa1be2e14d4bc01cb5070a246dcecbff5731b7f3935c382a09d018924 SHA512 ea299794cdf486dcefdc0f6816431ff7cdd06b6a0e05d6092aca91b7a6590b835e6a44308b19f70b177dfa1d2154e94a5fc751c7cd6a0c1cbc5142c8212d08ca -EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6166 BLAKE2B da87e6107b847ca1c396f0156a30b6601fe2f63365f8f240f5f2ad2fd176ed1381192deae9914477adc89f1e671136e5a7957c7abbf6f3eebd679faa96ed4e44 SHA512 e7c6b8cc95630d79ce7eab3d9bd495d48c42d30cb8093ae58f54345b1c2e218ce2341a720d356633651e521723b6733afefc049684b8282eb527dd260c73f0d9 -EBUILD compiler-rt-sanitizers-13.0.1.9999.ebuild 6279 BLAKE2B df8334b59452915cf01032ec01a83b1377558abfda797b9c95327fb56c7b9d7fc46af4a1eb86f1679a2c44e8e055f790929fe3485022b80bfc5e58623d79d96a SHA512 acbc028c23560765dc152ff982a57120536718ccabd7298e388187a13adb065610ad94ae51655622b69498305bec6e24f13c6c67fe00b4aa33df160140f593c4 -EBUILD compiler-rt-sanitizers-13.0.1_rc1.ebuild 6282 BLAKE2B 5fd607563088ad551f09ee07d0c087d208970c7e20e1faa0e21b88bc8775ae5594eb3a341469d2d5488e09d062ddfbad5e3044523376ce429a42e8e8b38dd7f9 SHA512 209def963cca6193e1dfdd20cc6b68829d292905827c6a7a23ebdc18eca67815783362649c68c1590f908916a52db0106c046dcb46d6eee746487f2c8bc38ba2 -EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 6285 BLAKE2B 4a58d2e54544efc3c3e5f93bc271f3ea1614cf57fbcbf6843f002a604408113d716af623cd48220c7b6213ca15d28740962b919e86bd9e2ee104bdd701732ded SHA512 ee85bf07631a79eea71973f2dbf006afde4642fd4fc001f0480618a846182ee4abdc8f2347d42fd90aa4da51ece7509c69ba001b61363f6e2eefe686d17d16e3 +EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6042 BLAKE2B b2e497920258f581395f794ac977615e42e153ea966fead3a7ce5fbd9c93831ec807f4b711ffc41a1ecb84214e3bd386ffc038b549bc9ade691b7f843a5032a4 SHA512 05092de752ccb3a1832eb834315a63e161b52a7bd4a52ec77b24adeff9611368fe1166bf7bd12b2111e15364a44d2573527111641d97b9e989e593342a4fbc9a +EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5959 BLAKE2B acfa1240b3ffa450fe5ede50a6d8bc9d32b06bea46da57f82c004fbde8e69693242037f9571bf885f56d16d3ead4711402f1c3a2bf65fb42741ea95b12a1baff SHA512 cf095eeaf547d431d60b11f147e5e8a03e3659a3b56ec98be4af3fdbd4cb3ed16891eb8066187bff27613f0c6a37d30d08725df95419b515f1038087c149ad82 +EBUILD compiler-rt-sanitizers-13.0.0-r1.ebuild 6162 BLAKE2B e9f41c36aa12ed0257e3fa3298a5504e13243c1f73a0c4e425a9660751011f05856d09f72eb6d6c5fe9c901b670173931899858420352bc63627df69feccb975 SHA512 b134ad7badbd4f6540f8d683c5a0b0b583702879465caa16a13ab0f528328d7db92ed214dae6698371671fec582429032b0d7dbcdcefa94721395f4d366de60a +EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6154 BLAKE2B 97eaca6637d5f368d5f21e6640486734d1fb60fca89cc330ab19b7d129c425f8eefabfa225711a624018972b403329434e44e55fd1f69cf148d2b0d642ba08ae SHA512 31c7c45eec392795267f8ca2efa1f2894e183ef4fc5f575fbc531a60ebee3c90c4bb4a551f82a6723a3010ac5196a8c83cbd1b7e49704d9b9cfbe1cc68753cf9 +EBUILD compiler-rt-sanitizers-13.0.1.9999.ebuild 6267 BLAKE2B b7ecec747a68860103387e1cae25abf3a1ac58bfbc50ee5c688eff80db144e36d2ae6f8ba799b8dbaf20f28c8c4d84059db61666bf99b3d54c462178c610d35e SHA512 75abb9c5f490c94d5f405fc77420996977fe471c4fbf8948ef9cf0c731bf4a418f6bb8697b1426e6e30b804dfd5f5a1c88af69f47ba944ab0cd5e0b99c650e5b +EBUILD compiler-rt-sanitizers-13.0.1_rc1.ebuild 6270 BLAKE2B 060af26424afc513543999476cc0dcecd68bc99dd69c651d7ba79c87cc8be4dd4d1639cb8fa0247e79c9eac55df60d17a634a6681fed277f50fcdb5cfa254ff4 SHA512 33e847e8cdffcf2bfe45f88797c944eac17d4526ba7a3dbb1ac4ecf8ae559e91b46a03eb540d164ec3a03c6f6acf38984e8e8e5835d0cb311bb6e01781f8196a +EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 6273 BLAKE2B 74cecea17e26529cf75ada6ba68c169d587033de3320ed5ed5f31ae85935cff691e9b025011338b34ea50d1a747f8fe2f3fe25874072cfb328704906d0c298bb SHA512 701c5f5d70c20d7cd1276763d7198438dc53772c2b2713be82a96b05d5ef3797d2866eb94b65b16d2a0e3f842caffe4578c12dc3e775368ebc0d7afc8811be0e MISC metadata.xml 1330 BLAKE2B 8381c36fb0ee37358cebacf512ee2a0ff6f2c0fc8e05544d9dc1bb1e11bc53f4196c2ecc6c8eb66c833f266c8d12da2c92a5f0b94cb3404397f925f9ebfc2a72 SHA512 6ea6159eb0929dc9f009ab326295549db329f7594dd5ff82e255238ed1fb17e3e8909079c915c6ae4829bb853666456772d17fa2078a332f6340807d6cd4f20e diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild index e089a94c228c..c56dd239fbd5 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang test elibc_glibc" +IUSE="+clang test" # base targets IUSE+=" +libfuzzer +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild index 5d5313171cc8..8e473f55140e 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang test elibc_glibc" +IUSE="+clang test" # base targets IUSE+=" +libfuzzer +memprof +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0-r1.ebuild index dc6d1d54b523..942810e86916 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0-r1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang debug test elibc_glibc" +IUSE="+clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild index 68f7e7b395dd..0e4e81fde951 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang debug test elibc_glibc" +IUSE="+clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild index f89af63c6d33..6a19654cbc0a 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild index c456d296bcb8..203bcf1a2488 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild index 4e70cfd227c4..12e5eb2d01e7 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" # sanitizer targets, keep in sync with config-ix.cmake diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index 27a122f13157..4862c9640071 100644 --- a/sys-libs/e2fsprogs-libs/Manifest +++ b/sys-libs/e2fsprogs-libs/Manifest @@ -1,4 +1,4 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d -EBUILD e2fsprogs-libs-1.46.4.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec +EBUILD e2fsprogs-libs-1.46.4-r1.ebuild 2133 BLAKE2B b7eb174de385458afe76c9ea9428a8975c2baede725f97e99f6cfee3ef70e96e9c4504950fc5fb4e0932a4b762fc792587a2d000d1210c625d674ccc3058793e SHA512 7145e1bea6deff81d89b8c086a0469894863aa6d6d30b9a55cdc74e72bda0b66ee5ee5fae599ecef5c448115ec7a05003c7bc661636ff54b16caffb592f0c958 MISC metadata.xml 463 BLAKE2B 076bfa2742b1e6abbd07bbf94f817aab64fcfa17e9c51314220e02bae2e9a209ebdafbd358e59655b471c25e47dfbe27745a50b0f929f2d640f06409f3e51804 SHA512 faab1a2ea1ddd7d9992fab3131b2a9b70a7f63b81f055856c8fbe9fe3c19a19044d1f2512252b29584914e06b0bc16d8d3ac02a59bc5706ea3509ebe1f65f5ed diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild new file mode 100644 index 000000000000..666389defb2c --- /dev/null +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs multilib-minimal usr-ldscript + +MY_PN=${PN%-libs} +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="e2fsprogs libraries (common error and subsystem)" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="static-libs" + +RDEPEND="!>=sys-fs/e2fsprogs-1.46.4-r51" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 +) + +src_prepare() { + default + + cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" +} + +multilib_src_configure() { + local myconf=( + --enable-elf-shlibs + $(tc-has-tls || echo --disable-tls) + --disable-e2initrd-helper + --disable-fsck + ) + + # we use blkid/uuid from util-linux now + if use kernel_linux ; then + export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myconf+=( --disable-lib{blkid,uuid} ) + fi + + ac_cv_path_LDCONFIG=: \ + ECONF_SOURCE="${S}" \ + CC="$(tc-getCC)" \ + BUILD_CC="$(tc-getBUILD_CC)" \ + BUILD_LD="$(tc-getBUILD_LD)" \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake -C lib/et V=1 + + emake -C lib/ss V=1 +} + +multilib_src_test() { + if multilib_is_native_abi; then + emake -C lib/et V=1 check + + emake -C lib/ss V=1 check + fi +} + +multilib_src_install() { + emake -C lib/et V=1 DESTDIR="${D}" install + + emake -C lib/ss V=1 DESTDIR="${D}" install + + # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support + # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and + # links to libcom_err.so). + gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} + +multilib_src_install_all() { + # Package installs same header twice -- use symlink instead + dosym et/com_err.h /usr/include/com_err.h + + einstalldocs +} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild deleted file mode 100644 index 722e3a0df067..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -MY_PN=${PN%-libs} -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="e2fsprogs libraries (common error and subsystem)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - ! -Date: Wed, 7 Jul 2021 09:36:22 +0300 -Subject: Fix https://puszcza.gnu.org.ua/bugs/?515 - -* src/gdbm.h.in: Include sys/types.h ---- a/src/gdbm.h.in -+++ b/src/gdbm.h.in -@@ -30,6 +30,7 @@ - # define _GDBM_H_ - - # include -+# include - - /* GDBM C++ support */ - # if defined(__cplusplus) || defined(c_plusplus) diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.20.ebuild deleted file mode 100644 index 1658e3a497be..000000000000 --- a/sys-libs/gdbm/gdbm-1.20.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" - -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838 - "${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480 -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -} diff --git a/sys-libs/gdbm/gdbm-1.21.ebuild b/sys-libs/gdbm/gdbm-1.21.ebuild deleted file mode 100644 index 6f0257fa15b7..000000000000 --- a/sys-libs/gdbm/gdbm-1.21.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz - https://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.21-gettext-ac.patch.gz -" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" - -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${WORKDIR}"/${PN}-1.21-gettext-ac.patch #696838 #811303 -) - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -} diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 477aa36fbf15..dfdd45e57288 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -39,6 +39,6 @@ EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603 EBUILD glibc-2.33-r1.ebuild 45233 BLAKE2B 881f8eebb4c7e4e78760b92bd6cb64de2372abed3f15b916ab0d47f60d5cbceaaedf2624db92aec97a2742f205e7b243a02f7ddd3932a83ba8d0de3b40f72caf SHA512 54978040ee64ccc03bf8aea55af21775d8e360fcf5eeddad61b36c51dcc016849e9650270463e46edbd35e7eb6ffa1c72f1068031c80b6fca316980674c22dce EBUILD glibc-2.33-r7.ebuild 46954 BLAKE2B da9c95ef74942a7261b8fb32b5ac926f71315e7197c8b235e4892bbdbbce1a4e3ad2c26c4587695dc54dd61f8cdbac274d1fb620815daec286ae8b682937ea2a SHA512 4861947122e6ccd3ddbdfe1f750dec174902ebf3778b6ac40dbda1b5e8598782800bfa40887a795858a7094ecb691f3647941d0dced05c3bedd113480c558c6e EBUILD glibc-2.34-r3.ebuild 48801 BLAKE2B dc3a516595b2e88b7635d2e80ebeed3bbb212391a751d4ae61c84dbd6ff9f4b47d4b5cc2dbba4dd87b204d7ed3be85ceb7f33bb53f3b33ec22b7be34c409e0b1 SHA512 3c002a12b8d17161959e7b0601911d06ec342306a01dbe9cb5c99ead8bc110e40cea65aad66f505b069cef281e2bc8167c52d05c376fc2133cdf70b791bdddc5 -EBUILD glibc-2.34-r4.ebuild 50229 BLAKE2B 459d0d487a39c9e8d1b4e218a70ceecb335e329ce062731507f837b8089cdd4d413e2783cc2c4574f873e9bf6572237a450ae7171d1529024f3563c34cef821e SHA512 7d624cabbdd5eb6987a3fc4d5683d1f1fe3e7ac638926c31e947d70d84e8090936946e1bce3a4c5cbc288ebdd0880526c4168d0d86d91f4b0245d1cb36638146 -EBUILD glibc-9999.ebuild 49734 BLAKE2B b779b9ae866f9f7e8ac7b4f7ebd6a7530a987228e21130ad8025b451e2d49567b8cced2a45db0e3b62966113d7c349682238595176a58b07f0ccdcfccba9ef48 SHA512 8baa4b090c515a4c3d8e21852ebe7042f13e070da02fdd6fd907803b60df68adce67d733554a2f45711a314a871c0c9565a5e757d3287cc8bb4b0b5f109b0b4b +EBUILD glibc-2.34-r4.ebuild 50241 BLAKE2B 76fea2a181a0dbe434f9c1fc44aecb048962315e7d3f3a52bffffba0cdcd10ebf0a1898e1e7a30df54d9cdf0c570e1cfd475951d2e772f9792827fab8c6f8fb6 SHA512 a118339632c4a450c43b70c8c4e1351bb184fae261780b15c683fcf0dceed16728eb686ce7e3d7df0f0b1442b3a6a2e747c32bf3f95cfa75d632e00a6644ea57 +EBUILD glibc-9999.ebuild 49746 BLAKE2B eddfed69a3cad48efd83011e6d0f91eee58be4ddb969e36cbd70cf9694ab098c86357ec7d9451c56a18c9497372ac6d85935ad6ee56be91a6466f0fe38bdb23a SHA512 166a9c4524c586dfe5d9f9e5ad18d701835aa488656a1b56aa26989e8eefde29a1c3ccd5a4019efeb1481807aba4bc331eacd0de7087db4d6a1962a6e0a8089f MISC metadata.xml 1701 BLAKE2B 91bd245d0a3685d76e3f874b50db872660054767fca5181871022fbdef9a18c4e674890bfed52cc3332c9557430ae8eec64505e67cdbedff000987406ab69ac5 SHA512 524edc37a01a47958ef557d586e8f06c6132481734ea28ed57e146969503fd129ad1da813a4d2d143a9bb8abe8810b0d8c920ab3c422a729287838435c44743a diff --git a/sys-libs/glibc/glibc-2.34-r4.ebuild b/sys-libs/glibc/glibc-2.34-r4.ebuild index 4346f19004c8..88f72ad1d7db 100644 --- a/sys-libs/glibc/glibc-2.34-r4.ebuild +++ b/sys-libs/glibc/glibc-2.34-r4.ebuild @@ -1546,7 +1546,7 @@ glibc_sanity_check() { # first let's find the actual dynamic linker here # symlinks may point to the wrong abi - local newldso=$(find . -name 'ld*so.?' -type f -print -quit) + local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit) einfo Last-minute run tests with ${newldso} in /$(get_libdir) ... diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 2cb4bf86808c..19d0bf001397 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1539,7 +1539,7 @@ glibc_sanity_check() { # first let's find the actual dynamic linker here # symlinks may point to the wrong abi - local newldso=$(find . -name 'ld*so.?' -type f -print -quit) + local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit) einfo Last-minute run tests with ${newldso} in /$(get_libdir) ... diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index a0954b2f691e..df50945d634d 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -4,8 +4,8 @@ DIST ldb-2.3.1.tar.gz 1718379 BLAKE2B e2aa196e6e09846be2a631d81bf0b94c0cd80984ac DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7 -EBUILD ldb-2.3.1.ebuild 2958 BLAKE2B 4772b687017e2bf2b3caf8b0036e973351b1870999cda1f4d97734de5b7823a4a04881df2cc5dfd971ef74c649e6d208fe89b9a1b0e93b4edbd068d3c7e49cbc SHA512 a79c712823172a0d057066fa9130aa3d1044002cd26984714d60a9df8073cdbc119f2b497adaafee6ec06f42068e9ec287741c78adcaf77b58d58f3f2312390f -EBUILD ldb-2.3.2.ebuild 2958 BLAKE2B 4772b687017e2bf2b3caf8b0036e973351b1870999cda1f4d97734de5b7823a4a04881df2cc5dfd971ef74c649e6d208fe89b9a1b0e93b4edbd068d3c7e49cbc SHA512 a79c712823172a0d057066fa9130aa3d1044002cd26984714d60a9df8073cdbc119f2b497adaafee6ec06f42068e9ec287741c78adcaf77b58d58f3f2312390f -EBUILD ldb-2.4.0-r1.ebuild 2965 BLAKE2B 5293b2e50baafd1d8456a754479490e7c33d901107c5e02626b776067b8b7513f3d5256bc651a31823f7f0dea9ec1f2ec0caa1044c0fb883fbed83555c27c1d2 SHA512 0e07f17782c88dd472d1d7e55df6241c04e535fbe7cb1cc7511dfb98fb2c13bb5b7e9ec0f101a93b50ca20eab5b439139c511ae4a707b630a3fd1adc470ac0c0 -EBUILD ldb-2.4.1.ebuild 2966 BLAKE2B 73acc4a2d887f831270afcabd5e8fbd5f864b040b77b1dbe169b1738dfab673641a9447e3cc5c35e69812698b7f980d803b26b4ab021032bbd70ae8027232d5c SHA512 0faa4a0b011ab32d57845ee12da878b13120775474c26321dc4d02fb9aa6f0a4c735d27f88ccce67adc98b2818658383b5263051031c227cdc3f7b4ac0045d40 +EBUILD ldb-2.3.1.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe +EBUILD ldb-2.3.2.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe +EBUILD ldb-2.4.0-r1.ebuild 2945 BLAKE2B b316c4132a2a821775acb807a336c531482f9e798bbac0035c577f528ea3ecb0b9d7e13a484746a23ce8cf274ac996816270b4340cc0eb2e951b119f7a5c79ed SHA512 57d1069bfbd0bc2d55e9407b753bf98fa00deeb8b3747b4f24bb19c965d6b6028d0ee605082d64c32b2c23c866f7cf3820518e42c146c612c53d163794c9dac9 +EBUILD ldb-2.4.1.ebuild 2946 BLAKE2B 21c7e8e42299f6aed846d63925c3bce581b456b0639c9ab4540d9f55908c47b130b0b255f81c212e4fb31142c578610b6a78f32dbd49919297fd4ecac6dfb2ea SHA512 c99046e4eeefcf723e5b201acb099a433722bb49016f0bc98afc5c9ea554790f6a6416f18d9e427504e96dfe15f64c232e9813480036733d1823c7cc14be2aab MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038 diff --git a/sys-libs/ldb/ldb-2.3.1.ebuild b/sys-libs/ldb/ldb-2.3.1.ebuild index b6e69d0d5297..b6f289c27beb 100644 --- a/sys-libs/ldb/ldb-2.3.1.ebuild +++ b/sys-libs/ldb/ldb-2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.3.2.ebuild b/sys-libs/ldb/ldb-2.3.2.ebuild index b6e69d0d5297..b6f289c27beb 100644 --- a/sys-libs/ldb/ldb-2.3.2.ebuild +++ b/sys-libs/ldb/ldb-2.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.4.0-r1.ebuild b/sys-libs/ldb/ldb-2.4.0-r1.ebuild index e11b7972d4af..054a066f3cbb 100644 --- a/sys-libs/ldb/ldb-2.4.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.4.1.ebuild b/sys-libs/ldb/ldb-2.4.1.ebuild index 36aa67609f5d..cd109691c887 100644 --- a/sys-libs/ldb/ldb-2.4.1.ebuild +++ b/sys-libs/ldb/ldb-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 9f0d907d830f..209f04752858 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -2,15 +2,10 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 827 BLAKE2B 0ed207a478c50dd9f3590cd36ab4b37e6c41ddb266709b1bf012cf11dec0c2f8e3f0cbb0918f3be72831321aa8953f936a2706f1038c4ce5287c73dc83887e43 SHA512 d0302604e28ed2354214d315a812422355f98cd69d2b3089dd20cef1e243e4ac433ae47026b57a8f6db66572693ce2523af6cb2a8e4715af266442de7dd33e9b AUX libcap-2.38-no_perl.patch 2856 BLAKE2B f10169dab10a60973a5fbbbe55a14342a7a582dd79a40a0ca33f3cc3cbd5c695ef7cfcce28d6448df8875903f53e265b85c6738d8fe8800bfa1e596748deecbe SHA512 6b3fdebe763b7f7300c4e6c16140f95c490e8fdd9a8d7b6ddf250299a32dcbd78b3a3936cf8bbeb381cd305966b37f381a26965e3ff91944ebdac22e810ec49f AUX libcap-2.48-build-system-fixes.patch 5591 BLAKE2B 20fce03037ffbd59e3000f7c757d698c412d5709d2a575b5b59197b263097a445684509b2d0b8d77ea0e3e39f7660147e676a12b8e56fc1e2204f8c8a8da1fe7 SHA512 a7e22630b2690b039f9b257dc148868ee9c5b397bab2bd9d6591ab57929be7fb9c75db2a51f08815a618756743299b08537d93eb7507a984eb7bcf086e82ff10 -AUX libcap-2.61-Wformat.patch 723 BLAKE2B c337561e8505a2d6afac05aa9f4b628ac3305c0fe5963d5b8ffd4767e5f8e4e5e01490801b91c2bc6bf676f9b86f95d600def2e3e02ebcee6e9a568e17cbd126 SHA512 810cc4249c0b64f5e7aa5308dfd0d491ace50b02a55b40696b0136a71213e3c600a853a68940411c3cb64a63af4b9c65f839803533ed29e475bfded2b571d51d -AUX libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch 813 BLAKE2B 0f2fffffab12d4c1cdd939aae5f8cb0e73073feec92af9f4bf44005a545c991d9649307370061a5dcbaa30285761276549da9253c891fc5ea0108f552c04cd8e SHA512 1ed308be3e66bb315584aa0bf7915893b168850fe9ef7c5035214abc6a2eea5371aaa7f14c2f2790e60c4024e7bb0c08eabb1b8ed63eb22113644d95f057b533 -AUX libcap-2.61-no_perl.patch 2469 BLAKE2B d059cb89175b413f5ddabc2c30e4c8f37226cbd589b936ba0cd94f9529d46abffa2679125e9c8e8f939ef3c7c0e68a1b3b16685ce5b386d82176862a05428bf6 SHA512 0706d6b5ee2d93fe58ae53c9850622b21531af682d4774ecaccb04bab11a45393c46a5c9c64ba3d2df1cf2b25152c72145f66951a9a16ac0452700b503f96d86 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 901 BLAKE2B 8b4795bfff00f3c42d22bfb748c60109c9fb210082bd0553d5d12c098008900d478a07455251228041be3448cf547ee4ec61217b1fa302feb86175592972bb08 SHA512 c6338a21bd66a4248ea3d35c0c39f864a9cd9c0cb0dd26860739fe3828282ff7e068888b3e39b1439f75f8f57db64cfd3a88542dfbb27ed04f65677e7f8ce632 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 -DIST libcap-2.61.tar.xz 173892 BLAKE2B 50874d3510ab2476aaceb775314d98744736aacd7364a23827756caa160c101e8bc890b7c33b5e19df8b30bb6b3b1c2be323e4b6a963f97e9ee557e86b4f13a0 SHA512 40096bf511d1c45e36f5d7f24e49c709528f3f01fcadd47b6ac40a7e8d5f1705b29b4cc56356b030639f67d0641b9f4e7c19449c3c7f4f77a4070c35745b465c DIST libcap-2.62.tar.xz 174772 BLAKE2B e3c86a5b88b9be932802ec8612f79e5f04912bf3e66f673eae2add85362292f4737c544d21b9e5adfd1a7a33c073568301b6532cdf0ea6c8b834d895b84323f1 SHA512 61ac004920c5cd3382a5443db2eacfc2041b7a8c0814b27084c1d111125639fe3950dea4325d0f7fb6bfb0d5de114452c3a62230cc958edb05ffdb83b213f9b3 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b -EBUILD libcap-2.61.ebuild 2327 BLAKE2B 61e1631f43cd316cfd686955d6de0cb7d523765a852b22b9076ef526dffdf84cf5c74214b1ae41bf5ac533106372c4181f3ed3f705cfd7274d92a5c4a33e8ac0 SHA512 cbc4c7ec717ed9aed891d5a138fb860d4729664c07af33f1e5ad969818d249629a116c89d780d40eb50d336c7c895f51eb4b33b67b3d5367d6126b7d50173cba -EBUILD libcap-2.62.ebuild 2247 BLAKE2B 49662d63bdc19e25c546951201fb3f5810c539192d26e28787792634328a2765c00d924e68856cebe0c98157f52ea7c07349e0aa0ce77673bdb8227406d25752 SHA512 054edd4c07258701adacff1bcd44bee955615eaf4a6b51b174b43adb7820040c9c29ef3331552ff5e33065a8ac6b0a3e364956001ab42f6a749896ee7a2e19b6 +EBUILD libcap-2.62.ebuild 2239 BLAKE2B 611e112d0305490791390c3db0af7f6a03b34b0518e4159fe7d2366e95242d6da779fff50cc36a6f62cdf32db9c65ec8ecbfba46ce54738e67c4790048d302c4 SHA512 41cd064b3e53b7d888cb91a74c7572f6e7dc2ee2b6eebe8683b24b836be871e0e12928bf88587b8a2cd5526bec0246eb2e100654ae6a9fc5dd6c7840eb128d2d EBUILD libcap-9999.ebuild 2164 BLAKE2B 6d44b9aadf000c40c8dd9c77fb88623fd24f7ea5f14c13515b3a3c06b1d1f615f8cf33876c51a17e553f3c76c553e1f1387f7caa7dc1dc333926616972e4ccfe SHA512 701d3d42487dc00e88a9101846b0f59976dc6baba977c045806c7986c08700496e5596019c1b7de084125ec1380252219dce86b3cf9461a7350c75d779762a24 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9 diff --git a/sys-libs/libcap/files/libcap-2.61-Wformat.patch b/sys-libs/libcap/files/libcap-2.61-Wformat.patch deleted file mode 100644 index e0046de58770..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-Wformat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9fd3e7ac5870f84c73ac777d9a14480227ad7f00 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sun, 28 Nov 2021 14:14:42 +0100 -Subject: [PATCH] Fix `-Wformat` on 32-bit platforms - ---- - libcap/cap_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/cap_test.c b/libcap/cap_test.c -index b7fb2c5..39df261 100644 ---- a/libcap/cap_test.c -+++ b/libcap/cap_test.c -@@ -124,7 +124,7 @@ static int test_short_bits(void) - } - if (strlen(tmp) > __CAP_NAME_SIZE) { - printf("cap_to_text buffer size reservation needs fixing (%ld > %d)\n", -- strlen(tmp), __CAP_NAME_SIZE); -+ (long int)strlen(tmp), __CAP_NAME_SIZE); - result = -1; - } - free(tmp); --- -2.34.1 - diff --git a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch deleted file mode 100644 index 25f853b2a982..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dfcdcfdcb9c462a05566aa8d3c6eca871f0ddbf Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 10 Feb 2016 09:52:45 +0100 -Subject: [PATCH] ignore RAISE_SETFCAP install failures - -While the new RAISE_SETFCAP feature is nifty, its failure to run (often -due to the fs not supporting it) shouldn't impair the default install. - -Signed-off-by: Mike Frysinger - -Forward ported from libcap-2.20 to libcap-2.25 - -Signed-off-by: Lars Wendler ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -39,7 +39,7 @@ - install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ - done - ifeq ($(RAISE_SETFCAP),yes) -- $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap -+ -$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap - endif - - test: diff --git a/sys-libs/libcap/files/libcap-2.61-no_perl.patch b/sys-libs/libcap/files/libcap-2.61-no_perl.patch deleted file mode 100644 index 3d42a4dc6135..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-no_perl.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 21 Nov 2018 11:00:54 +0100 -Subject: [PATCH] use awk/sed instead of perl for creating header files - -More systems should have awk/sed than perl. - -Signed-off-by: Mike Frysinger - -Forward ported from libcap-2.22 to libcap-2.26 -and incorporated the gperf-3.1 fix provided by Mike Gilbert - -Forward ported from libcap-2.26 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.38 - -Signed-off-by: Lars Wendler ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -20,6 +20,8 @@ - - # Always build libcap sources this way: - CFLAGS += -fPIC -+AWK = awk -+SED = sed - - # The linker magic needed to build a dynamic library as independently - # executable -@@ -82,8 +84,18 @@ - ./_makenames > cap_names.h - - $(GPERF_OUTPUT): cap_names.list.h -- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ -- sed -e 's/unsigned int len/size_t len/' -i $@ -+ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \ -+ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ -+ gperf \ -+ --ignore-case \ -+ --language=ANSI-C \ -+ --includes \ -+ --readonly \ -+ --null-strings \ -+ --global-table \ -+ --hash-function-name=__cap_hash_name \ -+ --lookup-function-name="__cap_lookup_name" \ -+ -c -t -m20 $(INDENT) > $@ - - # Intention is that libcap keeps up with torvalds' tree, as reflected - # by this maintained version of the kernel header. libcap dynamically -@@ -92,7 +104,7 @@ - UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h - cap_names.list.h: Makefile $(UAPI_HEADER) - @echo "=> making $@ from $(UAPI_HEADER)" -- perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@ -+ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@ - - $(STACAPLIBNAME): $(CAPOBJS) - $(AR) rcs $@ $^ diff --git a/sys-libs/libcap/libcap-2.61.ebuild b/sys-libs/libcap/libcap-2.61.ebuild deleted file mode 100644 index ad5ca82adcb8..000000000000 --- a/sys-libs/libcap/libcap-2.61.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs pam usr-ldscript - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git" -else - SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://sites.google.com/site/fullycapable/" - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -IUSE="pam static-libs tools" - -# While the build system optionally uses gperf, we don't DEPEND on it because -# the build automatically falls back when it's unavailable. #604802 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" -BDEPEND=" - sys-apps/diffutils - tools? ( dev-lang/go )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.61-no_perl.patch - "${FILESDIR}"/${PN}-2.61-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.61-Wformat.patch -) - -QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS - -src_prepare() { - default - multilib_copy_sources -} - -run_emake() { - local args=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - OBJCOPY="$(tc-getOBJCOPY)" - RANLIB="$(tc-getRANLIB)" - exec_prefix="${EPREFIX}" - lib_prefix="${EPREFIX}/usr" - lib="$(get_libdir)" - prefix="${EPREFIX}/usr" - PAM_CAP="$(usex pam yes no)" - DYNAMIC=yes - GOLANG="$(multilib_native_usex tools yes no)" - ) - emake "${args[@]}" "$@" -} - -src_configure() { - tc-export_build_env BUILD_CC - multilib-minimal_src_configure -} - -multilib_src_compile() { - run_emake -} - -multilib_src_test() { - run_emake test -} - -multilib_src_install() { - # no configure, needs explicit install line #444724#c3 - run_emake DESTDIR="${D}" install - - gen_usr_ldscript -a cap - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die - fi - - # install pam plugins ourselves - rm -rf "${ED}"/usr/$(get_libdir)/security || die - - if use pam ; then - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - fi -} - -multilib_src_install_all() { - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sys-libs/libcap/libcap-2.62.ebuild b/sys-libs/libcap/libcap-2.62.ebuild index 811890277ff9..6f1eb8a076a3 100644 --- a/sys-libs/libcap/libcap-2.62.ebuild +++ b/sys-libs/libcap/libcap-2.62.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="POSIX 1003.1e capabilities" diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 3710550d4fce..c9f0fbc1ba32 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -7,10 +7,10 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d -EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62 -EBUILD libcxx-12.0.1.ebuild 6700 BLAKE2B 95f0550dda3dc1b71a25dd2b3bf433f8fa92a12465a19558123dcf4704713af9c394544503eb1eed12251a392bf9ff91e69b994355a7f0fad5c00b5fa6457c26 SHA512 14c72df06a748c4788ad9e2f0e9de703e6ef3b9498f0ed8797ae2c31890754396cb2cdcb13b082b8f9a726929811cd421558a7867c9b1f5658827875fd2cf651 -EBUILD libcxx-13.0.0.ebuild 6779 BLAKE2B d0e34a8ce5899d4cc3193ff38ade25eb1724b4f74eee947f8d1a6966bc2c2769ebfbdeef58759cb732da74d265305778a4023f4e7817afc0d015d79fb533af53 SHA512 107cb690a1f2492c968a402d7a9f6c3a22691c225f4167349a8b2b568f2aeeba8283ffff5956f5357a04d58a8ee7ad6fa2a3082c998a86bc4a05a8ab0489c05a -EBUILD libcxx-13.0.1.9999.ebuild 6739 BLAKE2B d3a64e3bd251a455f39a92cf02aa5ff6c3511b2306f6aaf47cb2605e17f3e2d0b22156fe1c0e5087a404936fabda41e32c8bbefd2e733a65366f8ef65cb214e0 SHA512 dff5e069025b4f9a35ae37a8d87199173c62a729042f35549653330eaea389bc9ff11aa55fb77d2c135829695a808be356b0806c1e2f83d43188e624632a6084 -EBUILD libcxx-13.0.1_rc1.ebuild 6742 BLAKE2B f429f6dd210e2dc12acccd74ec6428fe90a8fbaf50ef8975fd01c00eb5e3e1741785828e96c180e23dca382ed5ed779b8e696b4b13c758daee8fb51c4aab8457 SHA512 1d2541c6d2aca5d603bb9adc835b2a673831ec61a1f7653f676b543da187c7beb9a3bf9f7ec89c00d91bc46237eb9d50798eeb0b4f9386638ed4636f29849c3b -EBUILD libcxx-14.0.0.9999.ebuild 6739 BLAKE2B d3a64e3bd251a455f39a92cf02aa5ff6c3511b2306f6aaf47cb2605e17f3e2d0b22156fe1c0e5087a404936fabda41e32c8bbefd2e733a65366f8ef65cb214e0 SHA512 dff5e069025b4f9a35ae37a8d87199173c62a729042f35549653330eaea389bc9ff11aa55fb77d2c135829695a808be356b0806c1e2f83d43188e624632a6084 +EBUILD libcxx-11.1.0.ebuild 6638 BLAKE2B 1c141e7dc80e2e4a47d7619500626458c931903c7efc1d5b1f3173ff927ec682b277ed0a932af1681df1416f499d98fd1e8c024ddd14d839a543bf42f673e896 SHA512 4d37e1d3077908dd49fd55b8422f12547848d58dede2b6f9be58d993862d71e47a45c6ce383677b46c178dbfd6c22559beb7f7745f3b589039208d63585174e2 +EBUILD libcxx-12.0.1.ebuild 6677 BLAKE2B 32a2f3bbff395d3c129cd4d168a8cb0ee1074c3fc164bf9a33f3287852c07af3e7443018b3fa31036f851cf5544bf80db0579ba2dfa2a3420801a6aef0dd6b05 SHA512 3820b6a249a36cf12ba72b4c4a3847ec035265ce23388dcdbc0547c5708737eee4cf449b14370badc13be3f79ecda2f3c788ac6c7f2f8063c3dd53b1e7b1bf62 +EBUILD libcxx-13.0.0.ebuild 6756 BLAKE2B c27aba7517136e19bdebd4f864958922000fd9d59791c0ae0407afffa5c39db21c3cbf2655532453679a54beddd46ad90df2a9482fed99501340f6b0073e264b SHA512 0516aed74ebe4cb170c2b3a975005f054e1227cdd8ae4807c7f1e6796055b09abce148a44425ffd12dde88eb8f638559e3a3dd6c7e29b1fe2bdc86123783f941 +EBUILD libcxx-13.0.1.9999.ebuild 6716 BLAKE2B ad2420099c6987e13b4ec545ce9e52f734f7032002999c5e8ab4a848f3797bd02ad6786fe533398e961d1587f8646dec33a9317fa9cf1b989aa97cc800f0f1e9 SHA512 5ce31705183eb83e3246e65d5a1fb8ed0706860628ceb3d34733fd5c591ec1c5c2907ee13732b2f8d78e732ed33a60b4cb1f070429041f07f8633f352830314f +EBUILD libcxx-13.0.1_rc1.ebuild 6719 BLAKE2B a10d4e77b0bb0e60cd9c2e8875e6669d4a2b9add8aad189f200e3c1b13c3398587451a7539771d9b4b84c26bb5ed938169dac93fe8d14fdcbfb5e10c819f8b55 SHA512 122d17dc87701a609c34825ac22d7de97ba30a28825e1602b5af7e497de728635e43145dbb8b2565234aa47a02c93fb6c7d62dde3383b1d0f87e894d8d30fc88 +EBUILD libcxx-14.0.0.9999.ebuild 6722 BLAKE2B 4f25763ab58e10be519adb7fd2fca0098cf8889e0a7c00c3e3891cab28fd895b84dadbf3045344e5c9ce78a9ad854b1a1dd7fb7760a1f6b38e23a1293012f407 SHA512 2f4593c77038988ddc41ec2b92637c70e4c0aaca85ff5ca6bb531764f4721b33b8f2b9ce91e268a5496eebc2ac559ce6b92a1db11dc658b540a29dafd98b8e4c MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2 diff --git a/sys-libs/libcxx/libcxx-11.1.0.ebuild b/sys-libs/libcxx/libcxx-11.1.0.ebuild index 16172647c295..a976ee77c535 100644 --- a/sys-libs/libcxx/libcxx-11.1.0.ebuild +++ b/sys-libs/libcxx/libcxx-11.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/libcxx-12.0.1.ebuild b/sys-libs/libcxx/libcxx-12.0.1.ebuild index 32d4aa2d1da6..32417c012865 100644 --- a/sys-libs/libcxx/libcxx-12.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild b/sys-libs/libcxx/libcxx-13.0.0.ebuild index 851870fd9e95..74bdf451ab48 100644 --- a/sys-libs/libcxx/libcxx-13.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild index be5566afa3bf..a9c71dc6e041 100644 --- a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild index f8fd0e126832..0e230df43a5d 100644 --- a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild index be5566afa3bf..ff9cb4ac3d94 100644 --- a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" +IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" @@ -34,7 +34,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) -LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} ) +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake ) LLVM_PATCHSET=9999-1 llvm.org_set_globals diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 0ccf2e8e2d65..915678043390 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -2,10 +2,10 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d -EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3 -EBUILD libcxxabi-12.0.1.ebuild 3543 BLAKE2B 23ac0eb64a29631b4bc4e18f3ae3cd03d8491b7a14cd88a35513da666c400e05ef2624c7eb214e0e4a6b297a993ca93ceedc0900bc3cdf850ff71157caa36f34 SHA512 0c7b72e68db1056f927283a361aa6771d77d5e5d8ecfb5f11a5204d82abd2843a9c6beccd7e2f2cbd95d23c4f4a863fb1cca7dd4f18ea66eb2f936af6ff5cb63 -EBUILD libcxxabi-13.0.0.ebuild 3616 BLAKE2B 5858918647fd9436167f7f239840ab17e43fc15472ab33462170a89c6d1c8400a2be8d6b7fa88da81affad6ddce974440659da5e89e6ae9e803786edda73b300 SHA512 884061d8d15fce36721a29d3fdb95d4967a7fa43709a1a1c7efe0dd836aa41b65f6fcd5bbeb1646a1829feb0cf40883045265c15c62b94af205974c86a1e24b8 -EBUILD libcxxabi-13.0.1.9999.ebuild 3579 BLAKE2B 79c3f0ca256500269bd03a8bd9645b4ae87b3bf6b08579eefbbcec270ab4113dffc8504c7e65e4fc5d3a8b29112a1a3f28ab5c9d9b88cf490f97d65baf104699 SHA512 516680fdbe4ee3cf381d2f6a8ffcc98bdc69b96f4c2404c55e8199f9daacb9f3ff1c556b06be966a4694c3c8673bab30051cb5e0ac8b314c82addb91c7925d06 -EBUILD libcxxabi-13.0.1_rc1.ebuild 3579 BLAKE2B 79c3f0ca256500269bd03a8bd9645b4ae87b3bf6b08579eefbbcec270ab4113dffc8504c7e65e4fc5d3a8b29112a1a3f28ab5c9d9b88cf490f97d65baf104699 SHA512 516680fdbe4ee3cf381d2f6a8ffcc98bdc69b96f4c2404c55e8199f9daacb9f3ff1c556b06be966a4694c3c8673bab30051cb5e0ac8b314c82addb91c7925d06 -EBUILD libcxxabi-14.0.0.9999.ebuild 3579 BLAKE2B 79c3f0ca256500269bd03a8bd9645b4ae87b3bf6b08579eefbbcec270ab4113dffc8504c7e65e4fc5d3a8b29112a1a3f28ab5c9d9b88cf490f97d65baf104699 SHA512 516680fdbe4ee3cf381d2f6a8ffcc98bdc69b96f4c2404c55e8199f9daacb9f3ff1c556b06be966a4694c3c8673bab30051cb5e0ac8b314c82addb91c7925d06 +EBUILD libcxxabi-11.1.0.ebuild 3548 BLAKE2B 322a3306a33c720fd242b6dc69c233562f24c373c76b13d7a41332b26e668b7742c33550fd41fd3f2f0965390ed0cc3185b05d36908e434067f94f353b27e2e3 SHA512 40b2755e57c13a6473a53da14c257d73a4e9d13ea4ed08d23957d15892d3a702f705d294059f0dc13320930214da7793037cd94715f64ebfebbfc2da8f23321a +EBUILD libcxxabi-12.0.1.ebuild 3532 BLAKE2B 87f97e6d1d5c222b1a421bc7ee0fb1e9f0156c5f34888456dc265356fd2ae5e1b22343cd8970acf2820852f9be12d48006dee1d9493972b5761781156393735d SHA512 6369fbc69360eb0bb25e49d4fc554b897a86c7ac081c99cdc97bf61ddfa6cfe75c297afb91fa3c8fb6f24db67cc326a5ee3de74e10fdab1702d1894b3a5ba8a3 +EBUILD libcxxabi-13.0.0.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0 +EBUILD libcxxabi-13.0.1.9999.ebuild 3568 BLAKE2B 530c789f770a424bd9a23ef8a7e2f2b075e882a03610e9dcb5167b6750f3efcc4f03f99932f9f79fb1347239610696fd4803b1cb1f48ba9c1efc3023d70e6be2 SHA512 d352e9fa5c6a1806f99c6cc74e92c225dd69132bdc7cf0e895b14d0998ada7b329d782e75df6f52b7209f7fd7618c11643353942e11732f4ed7ac615ed37fe72 +EBUILD libcxxabi-13.0.1_rc1.ebuild 3568 BLAKE2B 530c789f770a424bd9a23ef8a7e2f2b075e882a03610e9dcb5167b6750f3efcc4f03f99932f9f79fb1347239610696fd4803b1cb1f48ba9c1efc3023d70e6be2 SHA512 d352e9fa5c6a1806f99c6cc74e92c225dd69132bdc7cf0e895b14d0998ada7b329d782e75df6f52b7209f7fd7618c11643353942e11732f4ed7ac615ed37fe72 +EBUILD libcxxabi-14.0.0.9999.ebuild 3504 BLAKE2B 8d9e63ac6e0b6f77af5c25095ed8f95c49130c403da0d313bad1f84f4d56818bc5b3d38e02d2ee44014761407a7767d0a0ec4ca224ac115ef601450b50b76272 SHA512 5f3982f79607b0d40b53e0d4611e709cc8d03d0e245a368aaeb1e42aa2c719f4cd9f00cf17fb30ff41c6430b655c2d7ca88b208731ba7487206e8a70805d0c89 MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13 diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild index fa0f31dbb563..60fed4fd01c8 100644 --- a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild index bb4a7e9ab18f..a6a51a0b90b5 100644 --- a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild index 628752042eea..690b4d4e2681 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild index 36ccca5e938a..d260ea2e3450 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild index 36ccca5e938a..d260ea2e3450 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild index 36ccca5e938a..2bd92bc0287d 100644 --- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="+libunwind static-libs test elibc_musl" +IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" RDEPEND=" @@ -31,7 +31,7 @@ BDEPEND=" $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake ) +LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake cmake ) llvm.org_set_globals python_check_deps() { @@ -91,7 +91,6 @@ multilib_src_configure() { } wrap_libcxx() { - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" local CMAKE_USE_DIR=${WORKDIR}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( @@ -113,7 +112,7 @@ wrap_libcxx() { multilib_src_test() { wrap_libcxx cmake_src_compile - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die + mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/lib/" || die local -x LIT_PRESERVES_TMP=1 cmake_build check-cxxabi diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 9e60d88144e0..c72215143607 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -7,8 +7,8 @@ DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d16092aa5e58b5c38197461a0b4ca5967ec161140b2a63835a0cfa601eb31fc08cbaa492088269808d6d803c7a47a SHA512 23a429ded341114ea3c4282b974520146ea0734e01b5863c837d119517b39365b537126091f5efcf752ca7860bccf0e0e2d763b507e903321532db87bcd42b79 EBUILD libomp-12.0.1.ebuild 2968 BLAKE2B 4e5511872021796bc51f8544a9f6ca5372650297c3c805a1bb16696def4901b34ad6ecbb7fcd4ce87a192e04aacda3d121b8dd62175e3ab3fab7d2a28095fe09 SHA512 d1f169993b83021c8c31b1911d827b62be19b916f2c53b7ef7b59d82b88c241d36eb054947d56bea13cf064f8737050d988ab6379be8a09e81bb04d7e333e3ff -EBUILD libomp-13.0.0-r1.ebuild 3815 BLAKE2B 83157bf0d69f4c15d268d059215228e00b4f192a70d91903e41c52aef04f79d90484d0b3e455cd8ea95aa0e6e4a0959c3af67f06793cf9b38a16dfd08564b2c2 SHA512 75da1352febcf3d596e9b733070fbf957a052c856a2e3710c4bbdc216f2a902fdfb1fc8ebdfaaca9194ee2414bcae44e83e5bdda9e018d183e04f762c5535a74 -EBUILD libomp-13.0.1.9999.ebuild 3727 BLAKE2B 684536b9dce5ebe7e0e973eb085ff923c55a9afff200943ec962c6169e0062543b4378dda72144001b3a8b8736fa3f94a3109bf4ef49013c154872f9f2b98215 SHA512 304eb23923016bbed50fd3cf63ecfa4b6d0d22e29c57a07c9034d4ec6edd96c66471c3bcc41067aa52a5cd1aec035b206dc2d87d9ffc04d76f9e13ed30d69eff -EBUILD libomp-13.0.1_rc1.ebuild 3751 BLAKE2B 5601a3610923f3b6c5d594f9c8eb201afbad23bf039772ecb52a9169b289c3b6097e7ae1a7c4397fee38be8ba0124b507675cd09cbeb6ac427e43abc60fa0e4b SHA512 0ee02da8241f5d42254909652d2eb6521cdd29762e8febb8b19911536660eb1142163bba82407cd5850111afd781b39b646a4a6e5f1625d12a1f1cb1da7509ec -EBUILD libomp-14.0.0.9999.ebuild 3727 BLAKE2B 684536b9dce5ebe7e0e973eb085ff923c55a9afff200943ec962c6169e0062543b4378dda72144001b3a8b8736fa3f94a3109bf4ef49013c154872f9f2b98215 SHA512 304eb23923016bbed50fd3cf63ecfa4b6d0d22e29c57a07c9034d4ec6edd96c66471c3bcc41067aa52a5cd1aec035b206dc2d87d9ffc04d76f9e13ed30d69eff +EBUILD libomp-13.0.0-r2.ebuild 3821 BLAKE2B 602575af9707ee4318eca2c4df01c9bfd5352e14fae9bbca21c8c9641bbdc3006bc88d279ff3029bf4ef27d92f05fb54fb39d0a539cd378c467b903e6e5235fa SHA512 29ad1828dd6b711db49ef0bc997f15bc59d80a70bd82aadebedc8ff134edbaca9652d906125247d691b67b800d248610ebf7c0ce30773d7ebd05dbed4bd0184c +EBUILD libomp-13.0.1.9999.ebuild 3733 BLAKE2B 0475691284b18d69815ac7c7dd34e612eb54a388f51c8c1ef04f189a9f6901fd87357fb1bf2217727bbd5abe9dd74106a96b3456281eca0631602c64654069f9 SHA512 14238c95322345b420c21dce58afd929b08f6a559370fae05fa28c01da366921cde7c588dec49ddf24796f2c15a35fb01e2dcdbe6fead666f0dcd727924d178b +EBUILD libomp-13.0.1_rc1.ebuild 3757 BLAKE2B 56349165f3026f299e75cbe15a5efe08f7bbc72efc97941dccef06d1efffeffbdc3d2d7ab81899652d415036ea2edf8fe7400d768c09fdecdc3f688866b8a0cb SHA512 fcb2a1d9d5be7f8f7a5d442d9b92f47f3e8a5027744c3ceb85f49d2d6b06425d76aa8b073f75ff9a9c651d67b7940107ed9eed38d84a974c181442d2f490c56e +EBUILD libomp-14.0.0.9999.ebuild 3733 BLAKE2B 0475691284b18d69815ac7c7dd34e612eb54a388f51c8c1ef04f189a9f6901fd87357fb1bf2217727bbd5abe9dd74106a96b3456281eca0631602c64654069f9 SHA512 14238c95322345b420c21dce58afd929b08f6a559370fae05fa28c01da366921cde7c588dec49ddf24796f2c15a35fb01e2dcdbe6fead666f0dcd727924d178b MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f diff --git a/sys-libs/libomp/libomp-13.0.0-r1.ebuild b/sys-libs/libomp/libomp-13.0.0-r1.ebuild deleted file mode 100644 index 6a1e4016def4..000000000000 --- a/sys-libs/libomp/libomp-13.0.0-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake-multilib linux-info llvm llvm.org python-any-r1 - -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" -IUSE="cuda debug hwloc kernel_linux offload ompt test - llvm_targets_AMDGPU llvm_targets_NVPTX" -# CUDA works only with the x86_64 ABI -REQUIRED_USE=" - cuda? ( llvm_targets_NVPTX ) - offload? ( cuda? ( abi_x86_64 ) )" -RESTRICT="!test? ( test )" - -RDEPEND=" - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) - offload? ( - virtual/libelf:=[${MULTILIB_USEDEP}] - dev-libs/libffi:=[${MULTILIB_USEDEP}] - ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - )" -# tests: -# - dev-python/lit provides the test runner -# - sys-devel/llvm provide test utils (e.g. FileCheck) -# - sys-devel/clang provides the compiler to run tests -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - offload? ( - llvm_targets_AMDGPU? ( sys-devel/clang ) - llvm_targets_NVPTX? ( sys-devel/clang ) - virtual/pkgconfig - ) - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - sys-devel/clang - )" - -LLVM_COMPONENTS=( openmp llvm/include ) -LLVM_PATCHSET=${PV/_/-}-r2 -llvm.org_set_globals - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -kernel_pds_check() { - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then - local CONFIG_CHECK="~!SCHED_PDS" - local ERROR_SCHED_PDS="\ -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible -performance problems with libomp. If you are using one of the specified -kernel versions, you may want to disable the PDS scheduler." - - check_extra_config - fi -} - -pkg_pretend() { - kernel_pds_check -} - -pkg_setup() { - use offload && LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" - - -DLIBOMP_USE_HWLOC=$(usex hwloc) - -DLIBOMP_OMPT_SUPPORT=$(usex ompt) - - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload) - - # do not install libgomp.so & libiomp5.so aliases - -DLIBOMP_INSTALL_ALIASES=OFF - # disable unnecessary hack copying stuff back to srcdir - -DLIBOMP_COPY_EXPORTS=OFF - ) - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) - # a cheap hack to force clang - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" - # upstream defaults to looking for it in clang dir - # this fails when ccache is being used - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)" - ) - else - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF - ) - fi - use test && mycmakeargs+=( - # this project does not use standard LLVM cmake macros - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" - -DOPENMP_LIT_ARGS="$(get_lit_flags)" - - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" - ) - addpredict /dev/nvidiactl - cmake_src_configure -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake_build check-libomp -} diff --git a/sys-libs/libomp/libomp-13.0.0-r2.ebuild b/sys-libs/libomp/libomp-13.0.0-r2.ebuild new file mode 100644 index 000000000000..5f801a554c82 --- /dev/null +++ b/sys-libs/libomp/libomp-13.0.0-r2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake-multilib linux-info llvm llvm.org python-any-r1 + +DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" +HOMEPAGE="https://openmp.llvm.org" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" +IUSE="cuda debug hwloc kernel_linux offload ompt test + llvm_targets_AMDGPU llvm_targets_NVPTX" +# CUDA works only with the x86_64 ABI +REQUIRED_USE=" + cuda? ( llvm_targets_NVPTX ) + offload? ( cuda? ( abi_x86_64 ) )" +RESTRICT="!test? ( test )" + +RDEPEND=" + hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] ) + offload? ( + virtual/libelf:=[${MULTILIB_USEDEP}] + dev-libs/libffi:=[${MULTILIB_USEDEP}] + ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}] + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + )" +# tests: +# - dev-python/lit provides the test runner +# - sys-devel/llvm provide test utils (e.g. FileCheck) +# - sys-devel/clang provides the compiler to run tests +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + offload? ( + llvm_targets_AMDGPU? ( sys-devel/clang ) + llvm_targets_NVPTX? ( sys-devel/clang ) + virtual/pkgconfig + ) + test? ( + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + sys-devel/clang + )" + +LLVM_COMPONENTS=( openmp llvm/include ) +LLVM_PATCHSET=${PV/_/-}-r2 +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +kernel_pds_check() { + if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then + local CONFIG_CHECK="~!SCHED_PDS" + local ERROR_SCHED_PDS="\ +PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 +< 4.14-pf9) do not implement sched_yield() call which may result in horrible +performance problems with libomp. If you are using one of the specified +kernel versions, you may want to disable the PDS scheduler." + + check_extra_config + fi +} + +pkg_pretend() { + kernel_pds_check +} + +pkg_setup() { + use offload && LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + + local libdir="$(get_libdir)" + local mycmakeargs=( + -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" + + -DLIBOMP_USE_HWLOC=$(usex hwloc) + -DLIBOMP_OMPT_SUPPORT=$(usex ompt) + + -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload) + + # do not install libgomp.so & libiomp5.so aliases + -DLIBOMP_INSTALL_ALIASES=OFF + # disable unnecessary hack copying stuff back to srcdir + -DLIBOMP_COPY_EXPORTS=OFF + ) + if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) + # a cheap hack to force clang + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" + # upstream defaults to looking for it in clang dir + # this fails when ccache is being used + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)" + ) + else + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF + ) + fi + use test && mycmakeargs+=( + # this project does not use standard LLVM cmake macros + -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" + -DOPENMP_LIT_ARGS="$(get_lit_flags)" + + -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" + -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" + ) + addpredict /dev/nvidiactl + cmake_src_configure +} + +multilib_src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + + cmake_build check-libomp +} diff --git a/sys-libs/libomp/libomp-13.0.1.9999.ebuild b/sys-libs/libomp/libomp-13.0.1.9999.ebuild index 28c0f1fb620c..f1c1f78f6e9d 100644 --- a/sys-libs/libomp/libomp-13.0.1.9999.ebuild +++ b/sys-libs/libomp/libomp-13.0.1.9999.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) + hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] ) offload? ( virtual/libelf:=[${MULTILIB_USEDEP}] dev-libs/libffi:=[${MULTILIB_USEDEP}] diff --git a/sys-libs/libomp/libomp-13.0.1_rc1.ebuild b/sys-libs/libomp/libomp-13.0.1_rc1.ebuild index 7f61ca615aa0..6a8ad8fb455b 100644 --- a/sys-libs/libomp/libomp-13.0.1_rc1.ebuild +++ b/sys-libs/libomp/libomp-13.0.1_rc1.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) + hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] ) offload? ( virtual/libelf:=[${MULTILIB_USEDEP}] dev-libs/libffi:=[${MULTILIB_USEDEP}] diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild index 28c0f1fb620c..f1c1f78f6e9d 100644 --- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) + hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] ) offload? ( virtual/libelf:=[${MULTILIB_USEDEP}] dev-libs/libffi:=[${MULTILIB_USEDEP}] diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest index b837bb101980..a964dbbeb221 100644 --- a/sys-libs/libselinux/Manifest +++ b/sys-libs/libselinux/Manifest @@ -3,6 +3,6 @@ DIST libselinux-3.2.tar.gz 206380 BLAKE2B 544eaaa87b9738c61929abe48713b530a8909e DIST libselinux-3.3.tar.gz 206826 BLAKE2B e4cd2bf7172db1dd7661dd7981f875eb45f3c123805618edd03d7258f4b1f7afc974020187ec2e9e50dd59b3581ee21a29012eaa90ddfa82e43db4b8e60c51b7 SHA512 9a89c05ea4b17453168a985ece93ba6d6c4127916e657c46d4135eb59a1f6408faa0802cc2e49187defbde5247d659037beee089877affbab3eab6af3433696c EBUILD libselinux-3.1-r1.ebuild 4215 BLAKE2B 36d801acf1836645c710ba451aee245317c85dca7452ee990b1ae4f409e758d1cbdd3e47bd839e642e04e6d0cc30a4413060470a47a613a503361182d51128d6 SHA512 1e62339dd7530ce1eed4884024960e2012b533bc7d1160ce3a821956c502af7eaefee69dddb166df44a5d2a26940d5357400f5019c7b62cfc0209161cfa33af5 EBUILD libselinux-3.2.ebuild 4239 BLAKE2B ad7894053b45a7637e7c2e0584265077b848b522657b29738e80598706179e69044d773f9c4c2251ccba9f8564d6ab07402305a90bc3359422e4c15c30acf9c9 SHA512 8b379f9b3aef6fc99081a154f98e68abdcd6318b64658e52421f892a73cfc6a37495e0d3c689e2dcb0ed2a40d149c7484db850e078f7a9914b3b3fbcf31ebd3e -EBUILD libselinux-3.3.ebuild 4243 BLAKE2B 5c7c423ff4a25cd4631099320e406722fea8f539d4ac986f8be445de22fbc07b52b4190ff3709fde9df32e30213c4a3414df28e2971aa976a57a8c984bb88a10 SHA512 64dc774c7687ffb3c5a5d79943eefad9dac019352d1e458b81b1ca5d5766b6e2f757a49ec8118b514984ac793842534ce76c10c4075cd509d61210baf76464e5 +EBUILD libselinux-3.3.ebuild 4239 BLAKE2B ad7894053b45a7637e7c2e0584265077b848b522657b29738e80598706179e69044d773f9c4c2251ccba9f8564d6ab07402305a90bc3359422e4c15c30acf9c9 SHA512 8b379f9b3aef6fc99081a154f98e68abdcd6318b64658e52421f892a73cfc6a37495e0d3c689e2dcb0ed2a40d149c7484db850e078f7a9914b3b3fbcf31ebd3e EBUILD libselinux-9999.ebuild 4236 BLAKE2B e6a40e4b9ea98698d6eccf6b28ccdf520267e98793edca29651dece2727eae1e3de1348714d01661fc05c2bde6bc8efa9229bad0b6e5b954a4fcc1412d72e65d SHA512 95eee14c3c2d8f00d2bb914010cdaae7507ce5a335baeef486ce1ff4fbb6cf9bd4f7e680e860b4ca6d22304b2d383a6258fe9a1e305dba55da612f17905d2ac0 MISC metadata.xml 746 BLAKE2B 4965c5541d4d9481d3e74e28a7d40a47b17895b3fb095111a46524fa77ec45527306f7960375c2d5c1fcfa3cc106aebd6e055341e99b46a2bb2e2f464c6b35ed SHA512 683a5acd27beb458c2f6c8aa7404e4920923d873a993ac21f52b9191a86e0ca5a74e9376a9a6d9e7b225a95a79ae4e813a05184c8c49d0ed7859e768890f080f diff --git a/sys-libs/libselinux/libselinux-3.3.ebuild b/sys-libs/libselinux/libselinux-3.3.ebuild index 8653460938e6..8cb65e1d9e80 100644 --- a/sys-libs/libselinux/libselinux-3.3.ebuild +++ b/sys-libs/libselinux/libselinux-3.3.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index a89e8413d60e..ccb8579c1e35 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -3,6 +3,6 @@ DIST libsemanage-3.2.tar.gz 178839 BLAKE2B c0925812d784923a7a239ba919fc0a0e1d84c DIST libsemanage-3.3.tar.gz 178890 BLAKE2B f1ff2d25f0c98e9794cb443365e6193db80a42104b645ef4edf783db2eb3d940d1f39cddfa59f9a86ba16957c77852159b3ced83c5d01ecb1811aa6255f8be83 SHA512 6026d9773c0886436ad801bc0c8beac888b6fb62034edeb863192dea4b6ef34a88e080758820fe635a20e048ac666beee505a0f946258f18571709cca5228aad EBUILD libsemanage-3.1-r1.ebuild 4274 BLAKE2B eb0866da968e01b89d6ba51cdcdd89f8796b0beeac515a3dbb47a823d7d5b24b64e01a05948373e6a2159b80866394d98edef9d3048436e527b38f0e8a5cb40c SHA512 21cc2d83b6efd83a691010699104d7a5344c84665cc505d4cae13a1a5891c836c728760766ae9492bb1ab0ee03e4d9e764acf6d39aa52824a6e0175db72cfebf EBUILD libsemanage-3.2.ebuild 4278 BLAKE2B a6573952f71dba7cb067bfe450c688b78b75063b671b28dc370c22adc5dbe4e7229d7066969306a24229b5ef4753b180d1aa043137778bcac9ff85bc94a15c55 SHA512 35b73c5294c66272ca49e52bae6a459ddc16e6d6de4c520945d3829e338afcd2415b7f8b35fca0ad8643743e7463da62349090f6c480e8ee8c7d29a9e49671a1 -EBUILD libsemanage-3.3.ebuild 4282 BLAKE2B 3716d5e4f40f02f3c4fb51cbb9975046c8bf39906b8ec9e051d01cc9dd82c02d66abff58474472b66a9c31ee78afa43e09d6ef1aae526bf9380a8ee9512bc76a SHA512 5e131b3fe80ca66e1dd2c1de7383dfeab9172fd64eca70960373a582a12be2498d1423803144699cf1dca36c78aa2798199a255ba44b0d57a35e0e1b457b60b4 +EBUILD libsemanage-3.3.ebuild 4278 BLAKE2B a6573952f71dba7cb067bfe450c688b78b75063b671b28dc370c22adc5dbe4e7229d7066969306a24229b5ef4753b180d1aa043137778bcac9ff85bc94a15c55 SHA512 35b73c5294c66272ca49e52bae6a459ddc16e6d6de4c520945d3829e338afcd2415b7f8b35fca0ad8643743e7463da62349090f6c480e8ee8c7d29a9e49671a1 EBUILD libsemanage-9999.ebuild 4275 BLAKE2B f1cb24ab333c9f3d565d7a3d5a4fb80b6339b84b17cc4c7fc445ab1748f443d8ae15c51ff52500e8404f2e635082d24f220afa023f0516214dc2802290518efc SHA512 d2c375e0bd73b51cc663550ecad5401e2a21951105cec6fe0d12ee18e70334a0284afd3ab9eb7454dfe7a172a974804bacc86bd3071c67c03681536e8dc2eeeb MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664 diff --git a/sys-libs/libsemanage/libsemanage-3.3.ebuild b/sys-libs/libsemanage/libsemanage-3.3.ebuild index 88db66d921c2..cea18c8179bf 100644 --- a/sys-libs/libsemanage/libsemanage-3.3.ebuild +++ b/sys-libs/libsemanage/libsemanage-3.3.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest index c5596dd62b45..db59d8fc77f6 100644 --- a/sys-libs/libsepol/Manifest +++ b/sys-libs/libsepol/Manifest @@ -3,6 +3,6 @@ DIST libsepol-3.2.tar.gz 477749 BLAKE2B 6f35387c0373869672080e151f212c081389f679 DIST libsepol-3.3.tar.gz 482546 BLAKE2B 977996f68807f73a5bc0bd3a07b605640eb02a7bc67971882d489def166539ff7cfd00e474adde7e923fbebebdfcdcb71d17a43e3396c3176e25fd7d3bd65238 SHA512 fb6bb69f8e43a911a1a9cbd791593215386e93cb9292e003f5d8efe6e86e0ce5d0287e95d52fe2fbce518a618beaf9b1135aea0d04eaebcdbd8c6d07ee67b500 EBUILD libsepol-3.1.ebuild 1136 BLAKE2B 7ea108a698f5701cff8eea482f58442c9e339ed0c720f4cc9a50c2fee7513dc3f4b0d5427cfd1f67d72c48ac4659f31ee653a13cab56b441980c44a850e37a92 SHA512 cfd3e50a39e3dc0b35f961515b8c6d643826280489cc720376641b5b098bab3f883f009b924ca238a1f45af725da0a498a811fc8b841c7d5330e3ea0b7576f43 EBUILD libsepol-3.2.ebuild 1114 BLAKE2B 30238b022ac29f78b41a68dc92b7f3c668be4c1ea913e8a8318a1384071679abb66247b5738bc53d7b6f43af34ef3fd53ebf0c07dfabd52cf92e56b4e6c3bb1d SHA512 b59f7ed7ceed214843e703311eb8adca0b695ba1e891e63f1f94d405a3f97c57694e9a156d1ea3c616e1a600ea8ecb47ef0fa0999ec1912121b3df01fb9f5605 -EBUILD libsepol-3.3.ebuild 1118 BLAKE2B 5fc14ee13738cb5bf42042f18ce34bceb0a786a064a81a275693517f737f6d26b44b217d7c5e66819ea14e30e3bfa69636a75ce116b20a9d9c1e41b58298063b SHA512 48455f528c71f5076fe2683b47458a59c078903bfd7a7f888805068bcd7b006a2a5e5039c9a14c701c0cf4dae200f4e317d04f71875b6010e89c08f9838e4ffd +EBUILD libsepol-3.3.ebuild 1114 BLAKE2B 30238b022ac29f78b41a68dc92b7f3c668be4c1ea913e8a8318a1384071679abb66247b5738bc53d7b6f43af34ef3fd53ebf0c07dfabd52cf92e56b4e6c3bb1d SHA512 b59f7ed7ceed214843e703311eb8adca0b695ba1e891e63f1f94d405a3f97c57694e9a156d1ea3c616e1a600ea8ecb47ef0fa0999ec1912121b3df01fb9f5605 EBUILD libsepol-9999.ebuild 1111 BLAKE2B 8ae2517a060279cb7be432e25697ef5905856b9f271b78f28ee25a73d94efb969c28efb26b34bba4a43ad52f1c316767682fbd8c90f09b825921aae6f945684a SHA512 023d89e557b8dfdc6bcb92b18d0433a23cf030b1c179d8fbb583edf5e4fb7b5fc005ba4305f402e62e818793430141b6a69cda791e99c7dadca4ec0d8feecb89 MISC metadata.xml 402 BLAKE2B 0450441687952fc82e64536652076085d66870e8cd81d9aaa99d023d17d46bc8ef6627c9ebdd6084b4c60e7d26edb61b4aaf5693794105b04b500c74a37c25be SHA512 a107ad99e8050f4cbe1c32f76699524afdced1f4b9a0c0fb3a4b5954d4f9cd5993d4d047d7a3fb45fb68c2be361c658be48287e1099ea7a6b6fca7d676969c2d diff --git a/sys-libs/libsepol/libsepol-3.3.ebuild b/sys-libs/libsepol/libsepol-3.3.ebuild index 0878e1924775..58ebda5eaea9 100644 --- a/sys-libs/libsepol/libsepol-3.3.ebuild +++ b/sys-libs/libsepol/libsepol-3.3.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest index f8190d4bed10..5b1b65a02337 100644 --- a/sys-libs/libutempter/Manifest +++ b/sys-libs/libutempter/Manifest @@ -1,3 +1,3 @@ DIST libutempter-1.2.1.tar.gz 17429 BLAKE2B 88ae0a03a8a614b960082ce4d4006ec4e3eb8148b319ae964ac3ba3f684f08f5dd670e693f25d52d04a280f7b2aed6d2894cbbc0e2db3f71ab68e6910ffb58d1 SHA512 d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429 -EBUILD libutempter-1.2.1.ebuild 1575 BLAKE2B 00f5fddba51282408f7a87010ef3b39810e7878d44b25ffe36b36bcf7154db2e244701bbb7b39db609d84d15c84dbd39ac60157ac5919b32350e7ce88f0ece28 SHA512 bd038802a9483698f1be7a5f8cf91a7e7c100050d1e83345f3ee6964f061aadf38436c88ac0275d391d3926f088176e74d818c38b7b8ce8ce6a04f94256d799d +EBUILD libutempter-1.2.1.ebuild 1507 BLAKE2B 2e5ffb4359d2cadad76528d755827e32da5fb7a9d58370318d9bc0b2042b68486110c61597263285148abeb83beb6b47c1d5b40852ada2f6c7697ce8d11e53c9 SHA512 408e8cf71a6774854f0db2c0a77d7993047d52964d796796d7cc7456de072178bb4edfc038e676da75ceaaa2e00b38b40dfb11a087278c5b32c2f08bff548ec9 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild index 4e871a42e930..df75fe30ee63 100644 --- a/sys-libs/libutempter/libutempter-1.2.1.ebuild +++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info" HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter" @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs elibc_FreeBSD" +IUSE="static-libs" RDEPEND=" !sys-apps/utempter @@ -42,7 +42,6 @@ src_prepare() { } src_configure() { - use elibc_FreeBSD && append-libs -lutil tc-export AR CC } diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index d32c4b2302ea..65a4352bd346 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -7,5 +7,5 @@ EBUILD llvm-libunwind-12.0.1.ebuild 3656 BLAKE2B cdf5e4e4f39ce47ac57ac43f287b5d6 EBUILD llvm-libunwind-13.0.0.ebuild 3781 BLAKE2B 08d2c7ea77679aa9ea06997ce86d8c8c6c073ae3b8a1ff94be33c6dd5904425ae75632bf8ea3bd00825941e6c7a6fb4879693f33a94b54b9fe054a8ec61eeaec SHA512 b83af0f0a6d45e618d70fd59c7e4ff7dfa815c8eca650a65a4c892756197bc34ea389150bd65f01c6243ea54b0cfac476d5095f657f6a34e72d92967af600aeb EBUILD llvm-libunwind-13.0.1.9999.ebuild 3738 BLAKE2B 42b8d4826b8f3149ef28699064c6efa1291fe932fe7f3024e9513cc614345b6861d478b564fd5af29eafe8ff64badeb4db8ddd8a91c33234a64af7375aba247b SHA512 a3888f3fffb201e8e50e0dee86a99f2907217d2ecba1d028b7b5fbef6495d85a41e867c056344b9ea1167c10c63107d495adc67821fa767847e200256236d35b EBUILD llvm-libunwind-13.0.1_rc1.ebuild 3738 BLAKE2B 42b8d4826b8f3149ef28699064c6efa1291fe932fe7f3024e9513cc614345b6861d478b564fd5af29eafe8ff64badeb4db8ddd8a91c33234a64af7375aba247b SHA512 a3888f3fffb201e8e50e0dee86a99f2907217d2ecba1d028b7b5fbef6495d85a41e867c056344b9ea1167c10c63107d495adc67821fa767847e200256236d35b -EBUILD llvm-libunwind-14.0.0.9999.ebuild 3738 BLAKE2B 42b8d4826b8f3149ef28699064c6efa1291fe932fe7f3024e9513cc614345b6861d478b564fd5af29eafe8ff64badeb4db8ddd8a91c33234a64af7375aba247b SHA512 a3888f3fffb201e8e50e0dee86a99f2907217d2ecba1d028b7b5fbef6495d85a41e867c056344b9ea1167c10c63107d495adc67821fa767847e200256236d35b +EBUILD llvm-libunwind-14.0.0.9999.ebuild 3692 BLAKE2B e09e71f635937016cf586b39b5a3df828410c35caa8ffabfa884f96517317b9ea9ad91783e84e5964756d77dae2d7c9e1dd93924fd910664758c3a254b179e0b SHA512 e95efec14abd4ed427aec3415aca54b679cdf6b059ab842e676de1354803e3e4748b7a6501cb6736b8f4556e6ca80ee3dbb98c9a6edcc89442cdab7ee5f92336 MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild index b2e400ff295b..a9e274cc99af 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild @@ -25,7 +25,7 @@ BDEPEND=" $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake ) +LLVM_COMPONENTS=( libunwind libcxx llvm/cmake cmake ) LLVM_TEST_COMPONENTS=( libcxxabi ) llvm.org_set_globals @@ -55,6 +55,7 @@ multilib_src_configure() { -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) + -DLIBUNWIND_INSTALL_HEADERS=ON -DLIBUNWIND_TARGET_TRIPLE="${CHOST}" -DLLVM_INCLUDE_TESTS=$(usex test) @@ -66,17 +67,23 @@ multilib_src_configure() { -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt} ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi cmake_src_configure + + if use test; then + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + + # meh, we need to override the compiler explicitly + sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \ + -i "${BUILD_DIR}"/test/lit.site.cfg || die + fi } wrap_libcxxabi() { @@ -104,16 +111,15 @@ wrap_libcxx() { -DLIBCXX_ENABLE_SHARED=OFF -DLIBCXX_ENABLE_STATIC=ON -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF - -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_INCLUDE_BENCHMARKS=OFF ) - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" local CMAKE_USE_DIR=${WORKDIR}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx @@ -128,15 +134,8 @@ multilib_src_test() { wrap_libcxxabi cmake_src_configure wrap_libcxxabi cmake_src_compile wrap_libcxx cmake_src_compile - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die + mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/lib/" || die local -x LIT_PRESERVES_TMP=1 cmake_build check-unwind } - -multilib_src_install() { - cmake_src_install - - # install headers like sys-libs/libunwind - doheader "${S}"/include/*.h -} diff --git a/sys-libs/mtdev/Manifest b/sys-libs/mtdev/Manifest index d6eefe59ae95..4d8be655b6ef 100644 --- a/sys-libs/mtdev/Manifest +++ b/sys-libs/mtdev/Manifest @@ -1,3 +1,3 @@ DIST mtdev-1.1.6.tar.bz2 295965 BLAKE2B 212cf0f0bea0fc295528c90c6685770e88cb135a714cbf21e53b75ab2eaedd210269d073520e44c5bffafe8a5ecca521221061193725cba916bc2cf703fd5166 SHA512 859fb0803f330ecaae69f80713ff5a5235c0cb00de6d5ac2717ad82cea856a92b866f0c272ecfe743186abcf925f95585149ba4828b4c91555cfeb2f2a1c98f1 -EBUILD mtdev-1.1.6.ebuild 533 BLAKE2B 322b88200a31d8525337c0d9795b30bb03834d3a32805e1f1d8e2db9adda0643886bbdcec9d52699e41e5103a010c82a9b7c989b29f083a4736d9ffe97e80b86 SHA512 65c2a67804487848cad3456c917bef3c9394fee9d8ecbb4969605e2e60bc6549a0cb77ba1944f6e9dcd7f22642f95dc513730f1d1a3bc7e38630eaac6f6ef8d4 +EBUILD mtdev-1.1.6.ebuild 539 BLAKE2B ed8b6f9a950a7cdc582608e278d4e9f7466913be22f898bbfc6220ce75fe284807b4883d67302bf537240c8913fc0b1640dba48d666f44eb47f6a6ffe2e5cac5 SHA512 ad853de1913e8e9746f29f4d97bcf3e9b5a50a6f99ede232d7987a876cb2c934b13d27f38b2abb99c4bba55fe0210b74b4f56dfe54c6a5f8ffb60086208c076d MISC metadata.xml 308 BLAKE2B 9cadc46caecd7dd026499456c786004ba2da3c335ffc03b7007e841d5ff0b1b34358bc62fcb80f3e141e8930dd89e0eda587a0d2e4c82d4c1cea39ec8811ddeb SHA512 0086b4253cf84cc57327f96f81a5c7209740e1ee8f5c5384a7f60e30b062e1f740e2fc33cba79c2df75064ce1e9deb2ce9dfbcd9a544c8e537fbcf716b382c2e diff --git a/sys-libs/mtdev/mtdev-1.1.6.ebuild b/sys-libs/mtdev/mtdev-1.1.6.ebuild index 537a0e95a37c..abbd8dd4b15f 100644 --- a/sys-libs/mtdev/mtdev-1.1.6.ebuild +++ b/sys-libs/mtdev/mtdev-1.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://bitmath.org/code/mtdev/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="" DEPEND=">=sys-kernel/linux-headers-2.6.31" diff --git a/sys-libs/musl-nscd/Manifest b/sys-libs/musl-nscd/Manifest index dad05b157a22..350468dff4bc 100644 --- a/sys-libs/musl-nscd/Manifest +++ b/sys-libs/musl-nscd/Manifest @@ -4,7 +4,7 @@ AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340 DIST musl-nscd-1.0.3.tar.gz 45023 BLAKE2B de3985878745497f0f6904efba0ecf1c5d4ab96dd190fe0b776459db946749858821f51e75d457172da75cd68c5bba22143647b269473f35d41e0ab9bbac3e36 SHA512 b931a28d70bbcc19a5b592449e7400ee61d5af93511d44e2e63416010b3938f1d350a965b0ad876699bed406926d3180a0380868279e13d3456e2264c80a4b7d DIST musl-nscd-1.1.1.tar.gz 51598 BLAKE2B 0c14cfed06f766e174154cdedf046eee8206822d21ce6ac0f1d2c253224a9c8be2fabe6a7d9c0e7c63d1811e3ccf06ca7b2c9dcb728cde445108039723e486c2 SHA512 f067b1491c6c46c3070aa2f61328b874eb6ad390c2efc928e2fee591ef5997b40400e29495546a861e803460efa46024c7a01c53ddae5b763ef63c2f274fceea -EBUILD musl-nscd-1.0.3.ebuild 1099 BLAKE2B 15ec6f4c9a9f3b6e862a39bd00c1ecd0eb839b8325766e83e25a7273875471811407857a904f65b857f64fa76ae781bd8f16321e0478ba4cb4da77666d8435bf SHA512 906bbc4453aabd6cdddbd8417ea3725931cb63371f76677994ea45e1f0c29e91a5af1129f22bc748dd4500a7b67a40662d11e88e37aff534e118a9590f624c3d -EBUILD musl-nscd-1.1.1.ebuild 1048 BLAKE2B af3ad0def5f0ab1d43b5c69433b0c8825f30738c32c788eabdf8c1abe5bd5f03c0eac38be37fe27e65db156bc942b3af5e56e0568e0482a0e745c187eb023544 SHA512 466aae0ca3aeaf61d61ec728cc62837b4e7f156b4da03fe9a1a61f84884af29ba7291f2352bbeb156d2b0b7f87f14e773002afc64cda111d5798c8e33abda7e3 -EBUILD musl-nscd-9999.ebuild 1048 BLAKE2B af3ad0def5f0ab1d43b5c69433b0c8825f30738c32c788eabdf8c1abe5bd5f03c0eac38be37fe27e65db156bc942b3af5e56e0568e0482a0e745c187eb023544 SHA512 466aae0ca3aeaf61d61ec728cc62837b4e7f156b4da03fe9a1a61f84884af29ba7291f2352bbeb156d2b0b7f87f14e773002afc64cda111d5798c8e33abda7e3 +EBUILD musl-nscd-1.0.3-r1.ebuild 1101 BLAKE2B c621c807b6e67a1f7f065b52c46141872490292429267d4b4b25f0ba146d6521f1b0b51586ad9658e9ff570520c1f19ccd4c102a672fa36cc219a9836b510c4c SHA512 92fd85fcf7189d6100fbb2cc61f84b321c6496274497fe2f7aec8f8783e0e1098f148cb35b88bf6263d228752759e2ed254aa8dd91ed127eac363669ef733d2f +EBUILD musl-nscd-1.1.1-r1.ebuild 1050 BLAKE2B cea85f10294d54950273493010cff0c190489869150bad3cc3b672916a816306ca6d9ce4f2b6b6efcff42cafb592675a2152b56a99fb0ff6fadd35d13197e452 SHA512 2996d44d1ed7c746dd9dbc21301c5d54afa87712a118b6e32a49c2e82deee5fc93cc31f8b79a50d3a9bb90ba49837804ad4ab8a71ab0ec8c818ad4905901475d +EBUILD musl-nscd-9999.ebuild 1050 BLAKE2B cea85f10294d54950273493010cff0c190489869150bad3cc3b672916a816306ca6d9ce4f2b6b6efcff42cafb592675a2152b56a99fb0ff6fadd35d13197e452 SHA512 2996d44d1ed7c746dd9dbc21301c5d54afa87712a118b6e32a49c2e82deee5fc93cc31f8b79a50d3a9bb90ba49837804ad4ab8a71ab0ec8c818ad4905901475d MISC metadata.xml 409 BLAKE2B ca653f4adb52d2687254b7369de064903bc1a1144c96c8b0614c99471800900fb580670b5d59a7761fd0df8087c290b15bd3f905d798cea8b7c963f6462c3a07 SHA512 608025bee761c9c54fa7e4e395182c59b37bd92fc98f706811fcc1f7efc87514901327788a695c618d63902c526128b8c6471dd53f43a980f80a768b39071d1b diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild new file mode 100644 index 000000000000..bec1e9b35ef1 --- /dev/null +++ b/sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="musl-nscd is an implementation of the NSCD protocol for the musl libc" +HOMEPAGE="https://github.com/pikhq/musl-nscd" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pikhq/musl-nscd" + EGIT_BRANCH=master +else + SRC_URI="https://github.com/pikhq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="minimal" + +DEPEND=" + !sys-libs/glibc" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.2-fno-common.patch ) + +src_prepare() { + default + + sed -i '/LDFLAGS_AUTO=-s/d' configure || die "Cannot patch configure file" +} + +src_install() { + if use minimal; then + emake DESTDIR="${D}" install-headers + else + emake DESTDIR="${D}" install + + newinitd "${FILESDIR}"/nscd.initd nscd + systemd_dounit "${FILESDIR}"/nscd.service + newtmpfiles "${FILESDIR}"/nscd.tmpfilesd nscd.conf + + dodoc README + fi +} + +pkg_postinst() { + if ! use minimal; then + tmpfiles_process nscd.conf + fi +} diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild deleted file mode 100644 index 0f8e8326c8f1..000000000000 --- a/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles - -DESCRIPTION="musl-nscd is an implementation of the NSCD protocol for the musl libc" -HOMEPAGE="https://github.com/pikhq/musl-nscd" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/pikhq/musl-nscd" - EGIT_BRANCH=master -else - SRC_URI="https://github.com/pikhq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="minimal" - -DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-fno-common.patch ) - -src_prepare() { - default - - sed -i '/LDFLAGS_AUTO=-s/d' configure || die "Cannot patch configure file" -} - -src_install() { - if use minimal; then - emake DESTDIR="${D}" install-headers - else - emake DESTDIR="${D}" install - - newinitd "${FILESDIR}"/nscd.initd nscd - systemd_dounit "${FILESDIR}"/nscd.service - newtmpfiles "${FILESDIR}"/nscd.tmpfilesd nscd.conf - - dodoc README - fi -} - -pkg_postinst() { - if ! use minimal; then - tmpfiles_process nscd.conf - fi -} diff --git a/sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild b/sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild new file mode 100644 index 000000000000..775e2a99b755 --- /dev/null +++ b/sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="musl-nscd is an implementation of the NSCD protocol for the musl libc" +HOMEPAGE="https://github.com/pikhq/musl-nscd" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pikhq/musl-nscd" + EGIT_BRANCH=master +else + SRC_URI="https://github.com/pikhq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="minimal" + +DEPEND=" + !sys-libs/glibc" +RDEPEND="${DEPEND}" + +src_prepare() { + eapply_user + + sed -i '/LDFLAGS_AUTO=-s/d' configure || die 'Cannot patch configure file' +} + +src_install() { + if use minimal; then + emake DESTDIR="${D}" install-headers + else + emake DESTDIR="${D}" install + + newinitd "${FILESDIR}"/nscd.initd nscd + systemd_dounit "${FILESDIR}"/nscd.service + newtmpfiles "${FILESDIR}"/nscd.tmpfilesd nscd.conf + + dodoc README + fi +} + +pkg_postinst() { + if ! use minimal; then + tmpfiles_process nscd.conf + fi +} diff --git a/sys-libs/musl-nscd/musl-nscd-1.1.1.ebuild b/sys-libs/musl-nscd/musl-nscd-1.1.1.ebuild deleted file mode 100644 index 78daab8676aa..000000000000 --- a/sys-libs/musl-nscd/musl-nscd-1.1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles - -DESCRIPTION="musl-nscd is an implementation of the NSCD protocol for the musl libc" -HOMEPAGE="https://github.com/pikhq/musl-nscd" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/pikhq/musl-nscd" - EGIT_BRANCH=master -else - SRC_URI="https://github.com/pikhq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="minimal" - -DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" - -src_prepare() { - eapply_user - - sed -i '/LDFLAGS_AUTO=-s/d' configure || die 'Cannot patch configure file' -} - -src_install() { - if use minimal; then - emake DESTDIR="${D}" install-headers - else - emake DESTDIR="${D}" install - - newinitd "${FILESDIR}"/nscd.initd nscd - systemd_dounit "${FILESDIR}"/nscd.service - newtmpfiles "${FILESDIR}"/nscd.tmpfilesd nscd.conf - - dodoc README - fi -} - -pkg_postinst() { - if ! use minimal; then - tmpfiles_process nscd.conf - fi -} diff --git a/sys-libs/musl-nscd/musl-nscd-9999.ebuild b/sys-libs/musl-nscd/musl-nscd-9999.ebuild index 78daab8676aa..775e2a99b755 100644 --- a/sys-libs/musl-nscd/musl-nscd-9999.ebuild +++ b/sys-libs/musl-nscd/musl-nscd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,8 +22,8 @@ SLOT="0" IUSE="minimal" DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" + !sys-libs/glibc" +RDEPEND="${DEPEND}" src_prepare() { eapply_user diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest index 822f99c80fe6..dffe4a018161 100644 --- a/sys-libs/newlib/Manifest +++ b/sys-libs/newlib/Manifest @@ -1,5 +1,7 @@ AUX newlib-3.3.0-no-nano-cxx.patch 1338 BLAKE2B ff16751b01784a38dc07aa79120c38f0274bb14caeeb653cecca4b3ca69c60a72e0e1918fea8f2c0f4734293817539122fa41b349f61ceabb3cb9ae878a11d13 SHA512 08dfc7d854dc75c8b875fa7c1829078c8df8988b4ba2b20739d387c656ca63b8b344487861d23658e31b72f911d05c2f57abe51bdf3b2dedcc88ce072c6595c8 DIST newlib-4.1.0.tar.gz 18648429 BLAKE2B c4d4d734bceeacf05b75d450d4316392d0000266812f98f99cd3f9f0926ac9848e1dc145361827d1d6951edfe5f109923c982d9f284f927ffc5fd5e5edaf8be6 SHA512 6a24b64bb8136e4cd9d21b8720a36f87a34397fd952520af66903e183455c5cf19bb0ee4607c12a05d139c6c59382263383cb62c461a839f969d23d3bc4b1d34 +DIST newlib-4.2.0.20211231.tar.gz 18921589 BLAKE2B fb85a368d082e2b9005d5d295d6854eb7d0e351cfade6516e6a06b18656d9139d7629f55a6d5f63337c6bce511a2373e797bed96847f19941b26cacfb1c8d3bc SHA512 0c3efd7b74a6b8457a717cbb6aa6c5ff268eeaba375535465c6bd6502c3d32b54a9bc3ba7f2c6990f78e29152eee2f62acb39b674d24f9ddf440374a1ec9d2e8 EBUILD newlib-4.1.0-r1.ebuild 4482 BLAKE2B b66394e3023130851f37adbba484d7a394c0d41e5a1d04f534bf1e1d71ed57d0ee65deccc6b1e10569bfca7d4f87b354eca82d785991f8bed0e22741104416c0 SHA512 cce2be618954ee7e935159f3549773d25d0cf1ef5fd72ea638ce38783f0b0314b3d2f7b86fa8ef24e1039eaf392ce3eea0a4fb765ef6dd54a5a27c38147d5c73 +EBUILD newlib-4.2.0.20211231.ebuild 4482 BLAKE2B b66394e3023130851f37adbba484d7a394c0d41e5a1d04f534bf1e1d71ed57d0ee65deccc6b1e10569bfca7d4f87b354eca82d785991f8bed0e22741104416c0 SHA512 cce2be618954ee7e935159f3549773d25d0cf1ef5fd72ea638ce38783f0b0314b3d2f7b86fa8ef24e1039eaf392ce3eea0a4fb765ef6dd54a5a27c38147d5c73 EBUILD newlib-9999.ebuild 4482 BLAKE2B b66394e3023130851f37adbba484d7a394c0d41e5a1d04f534bf1e1d71ed57d0ee65deccc6b1e10569bfca7d4f87b354eca82d785991f8bed0e22741104416c0 SHA512 cce2be618954ee7e935159f3549773d25d0cf1ef5fd72ea638ce38783f0b0314b3d2f7b86fa8ef24e1039eaf392ce3eea0a4fb765ef6dd54a5a27c38147d5c73 MISC metadata.xml 414 BLAKE2B 0e367a5f7b225bd2d381433ff239e076c3de8feb795ddb586d867bbc9a1b990379a3f27a39ede9549c7e328262004101e4392560717f596c941e9a152848eacb SHA512 44000ecc340eb2da9391ac9b226486e0f95aeb8de5bc7633882fef97943e0348bbb04ada64a15c82d2995d8aaedac5da1fa8c9d453c4ab3d2efc51ce06ab6477 diff --git a/sys-libs/newlib/newlib-4.2.0.20211231.ebuild b/sys-libs/newlib/newlib-4.2.0.20211231.ebuild new file mode 100644 index 000000000000..a6ad7b9c65d1 --- /dev/null +++ b/sys-libs/newlib/newlib-4.2.0.20211231.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git" + inherit git-r3 +else + SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Newlib is a C library intended for use on embedded systems" +HOMEPAGE="https://sourceware.org/newlib/" + +LICENSE="NEWLIB LIBGLOSS GPL-2" +SLOT="0" +IUSE="nls threads unicode headers-only nano" +RESTRICT="strip" + +PATCHES=( + "${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch +) + +NEWLIBBUILD="${WORKDIR}/build" +NEWLIBNANOBUILD="${WORKDIR}/build.nano" +NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install" + +# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's +# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4 +# Currently newlib can't be built itself when _FORTIFY_SOURCE +# is set. +CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE" +CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE" + +pkg_setup() { + # Reject newlib-on-glibc type installs + if [[ ${CTARGET} == ${CHOST} ]] ; then + case ${CHOST} in + *-newlib|*-elf) ;; + *) die "Use sys-devel/crossdev to build a newlib toolchain" ;; + esac + fi + + case ${CTARGET} in + msp430*) + if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then + # bug #717610 + die "gcc for ${CTARGET} has to be 10.1 or above" + fi + ;; + esac +} + +src_configure() { + # TODO: we should fix this + unset LDFLAGS + CHOST=${CTARGET} strip-unsupported-flags + CCASFLAGS_ORIG="${CCASFLAGS}" + CFLAGS_ORIG="${CFLAGS}" + + local myconf=( + # Disable legacy syscall stub code in newlib. These have been + # moved to libgloss for a long time now, so the code in newlib + # itself just gets in the way. + --disable-newlib-supplied-syscalls + ) + [[ ${CTARGET} == "spu" ]] \ + && myconf+=( --disable-newlib-multithread ) \ + || myconf+=( $(use_enable threads newlib-multithread) ) + + mkdir -p "${NEWLIBBUILD}" + cd "${NEWLIBBUILD}" + + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}" + ECONF_SOURCE=${S} \ + econf \ + $(use_enable unicode newlib-mb) \ + $(use_enable nls) \ + "${myconf[@]}" + + # Build newlib-nano beside newlib (original) + # Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2 + if use nano ; then + mkdir -p "${NEWLIBNANOBUILD}" || die + cd "${NEWLIBNANOBUILD}" || die + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}" + ECONF_SOURCE=${S} \ + econf \ + $(use_enable unicode newlib-mb) \ + $(use_enable nls) \ + --enable-newlib-reent-small \ + --disable-newlib-fvwrite-in-streamio \ + --disable-newlib-fseek-optimization \ + --disable-newlib-wide-orient \ + --enable-newlib-nano-malloc \ + --disable-newlib-unbuf-stream-opt \ + --enable-lite-exit \ + --enable-newlib-global-atexit \ + --enable-newlib-nano-formatted-io \ + ${myconf} + fi +} + +src_compile() { + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}" + emake -C "${NEWLIBBUILD}" + + if use nano ; then + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}" + emake -C "${NEWLIBNANOBUILD}" + fi +} + +src_install() { + cd "${NEWLIBBUILD}" || die + emake -j1 DESTDIR="${D}" install + + if use nano ; then + cd "${NEWLIBNANOBUILD}" || die + emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install + # Rename nano lib* files to lib*_nano and move to the real ${D} + local nanolibfiles="" + nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print) + for f in ${nanolibfiles}; do + local l="${f##${NEWLIBNANOTMPINSTALL}}" + mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die + done + + # Move newlib-nano's version of newlib.h to newlib-nano/newlib.h + mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die + mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \ + "${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die + fi + + # minor hack to keep things clean + rm -rf "${D}"/usr/share/info || die + rm -rf "${D}"/usr/info || die +} diff --git a/sys-libs/obstack-standalone/Manifest b/sys-libs/obstack-standalone/Manifest index 25e4aa2c0372..ec75f1d30ed6 100644 --- a/sys-libs/obstack-standalone/Manifest +++ b/sys-libs/obstack-standalone/Manifest @@ -1,3 +1,3 @@ DIST obstack-standalone-1.1.tar.gz 11561 BLAKE2B c6eba8ed7e235dcdefcfa7244d6318c6ac4d4b6d12a8f4778753bbc762ec98439724e1e8bbba4b1a04fbbafe56a1634bbb1c604c4d5f30574da39c82d52ca1c1 SHA512 e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757 -EBUILD obstack-standalone-1.1.ebuild 774 BLAKE2B 0493196826252536f6115f4aa9986989c8dd6403f370e7587b1f3b9b07c3d0e366f97e73dae3c9519887d45f75fb39f19bed1de41e72fb2c0c3d2139fb907c5d SHA512 424f303905ce98c696901d0dd605bb42d6ee0b3705be0f363572001c0eed10f5b098e929a0c5fcc294665b12bd654fb8271cef700d82f39b17b7c211e279973a +EBUILD obstack-standalone-1.1.ebuild 755 BLAKE2B 2829d3715a8bbd68076e49b602a95d372d6f776db496d4b5c0266ff926edd5debc1bec8d16493537eff311577c3dedde295249d7202399a28eca3f18f836817d SHA512 402294f0f49d9d57ec9e1c0e43445843ed7f66a557d5825a92d94b9ff007e7669e5bf286f75be558ebcf73eb88d5d827e2c8e852e51d002e57e54c8ca6128a7b MISC metadata.xml 339 BLAKE2B c0445ede4840838b57a628ef630bd048863c0e3be6c35587c2e4588d89c972adad634d16db774aff79d01d3f633a8d2831d15a2e32fe8f0d91622250720a98ee SHA512 ed6999db981738a7bd3801e063d403a7149deb67fc09fd7e84c9f126510df7c4c2e2eaa1a237515dca1bd618c773b510ba2f3789c4e2a7415bb186f0c1e0b08a diff --git a/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild b/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild index 12d8cbc9eb24..ab63552c9de4 100644 --- a/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild +++ b/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools -DESCRIPTION="A standalone library to implement GNU libc's obstack." +DESCRIPTION="A standalone library to implement GNU libc's obstack" HOMEPAGE="https://github.com/pullmoll/musl-obstack" SRC_URI="https://github.com/pullmoll/musl-obstack/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -15,8 +15,7 @@ KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" IUSE="static-libs" DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" + !sys-libs/glibc" S="${WORKDIR}/musl-obstack-${PV}" diff --git a/sys-libs/queue-standalone/Manifest b/sys-libs/queue-standalone/Manifest index 8efa05a89131..541a845ddfe9 100644 --- a/sys-libs/queue-standalone/Manifest +++ b/sys-libs/queue-standalone/Manifest @@ -1,3 +1,3 @@ AUX queue.h 19539 BLAKE2B e3a4433d8b0a36bf8beb2678521a45b104ee0bbed2c32cd52d8bc60443fe97aa682c78b3fa65b40813e6bd0cd3b6a6bf75836f630c83dcbf7ba6e682547c0879 SHA512 0bd66194fc3c6ee185948d17cc34475afd19a7a3b6c1d2531fb7fac68bee6fd170428188b2c0c74a918adbfded43c4fb36892823c78c197e0af484d24601adef -EBUILD queue-standalone-0.1-r1.ebuild 429 BLAKE2B 555d8f700fa306e5e5df7a30ac7cc6d1fab07095954b6e9d1f9fa061773bb803eb1dd4e51fdbe09138991bc43cebeb9008fe5f572c2697d163e7c54bfcfa065f SHA512 e51bee9ff8f0ffe4bea242e697e28a4bb6ce8221995d6896c6255150d97a85984f5e7c5024e1eb2234103a7346ed8e931814f1cc943877c4d299cad1f50195a2 +EBUILD queue-standalone-0.1-r1.ebuild 410 BLAKE2B bc83d85cd28909d4f8548cc9364a184f66634fd442d33ad8f9211339af05a910446fdd37c7a85e836f5595219c2baea9c922d03bbd1856a3c83b0729a00c92d9 SHA512 721263d6a31a4e43fa6085d6c04e59e0b929c8c24dfabc9e6dc17bfcf0c3b5cc910f60d7c908585d33225a87a19f5a678262675c89826bf8d3da72fd430f3b3d MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467 diff --git a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild index 133216a3d29b..cbdaa9876e04 100644 --- a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild +++ b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DESCRIPTION="Install from glibc." +DESCRIPTION="Install from glibc" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="BSD" @@ -11,8 +11,7 @@ SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" + !sys-libs/glibc" S="${WORKDIR}" diff --git a/sys-libs/rpmatch-standalone/Manifest b/sys-libs/rpmatch-standalone/Manifest index f0efb217e50d..9129cb900ed0 100644 --- a/sys-libs/rpmatch-standalone/Manifest +++ b/sys-libs/rpmatch-standalone/Manifest @@ -1,3 +1,3 @@ DIST rpmatch-standalone-1.0.tar.gz 3151 BLAKE2B e396d18bfb092aa59c70e81028ba889c1095c97b5f13bffbb4ae7b97a1ce63a6c536663304e4fdefaa06a22854dd5b986ff7238f0091b23bcd336cc6db0fca75 SHA512 9d8fc3be66f23b57793eccf62998d1c0ff8df24d8781d37ee99faf618cdceeda778132df2c75ace2ecd8aa6392bcdf15eaa9ce0acd657401af049ccf61fd5b14 -EBUILD rpmatch-standalone-1.0.ebuild 807 BLAKE2B 1b12d3c301190140ee79ded5e6cb1321ece98bb4358462357123ff1c5337f24e106e967862485bd2939af3e9330d9813bba1666002d59db96972f0f36dc533a8 SHA512 0a9f581b18be40bf695b880dece5e5365cece77e30fb5174d87502f9188f6e71e4c40137f3907290bf5d0d433f7cd4049471d05ce45a2d09159ab441a0c139d4 +EBUILD rpmatch-standalone-1.0.ebuild 786 BLAKE2B 4d24cf253a9ca9df61b7fae87f5e9d7e52389521b6324945c8b97f13055ac8835571f4db0d38268c12f9976d267001905485fd330f66d0acc1edbd80390153fb SHA512 48d6a8213e25a9b62b15f3eb2835208a9b4f190a6a6e217dcf4d3f69b07f2abba1cbedb8f1dd77ed57de4dd5e16a2fdd8e0d1b23231fa341eac26816efaa71d0 MISC metadata.xml 339 BLAKE2B 4b7feb412e98b6883bbf165c78f80a410746765300c4b3fe08e223a166e10d9935e8b599545b0d83cec1bc1e9ca0bf50888c250532e773d47de430c33fda02aa SHA512 6d80d61604d7aa7f3847bac236b75b4af6ae9de33c1c21a8cb227820299dbc7d2187a2514491b571f3e8f688a1cc34836b5cd32232310fd29692d29ca5b847cc diff --git a/sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild b/sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild index 4881a46decc1..6cacfa6cfc13 100644 --- a/sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild +++ b/sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" IUSE="static-libs" DEPEND=" - !sys-libs/glibc - !sys-libs/uclibc" + !sys-libs/glibc" S="${WORKDIR}/musl-rpmatch-${PV}" diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest index 29ce866853ec..0f035d453084 100644 --- a/sys-libs/talloc/Manifest +++ b/sys-libs/talloc/Manifest @@ -1,5 +1,5 @@ DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1 DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f -EBUILD talloc-2.3.2.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097 -EBUILD talloc-2.3.3.ebuild 3433 BLAKE2B 6563f46965b3aab227ab4ac880af81a1c107ee681486db4959325fb3be94ca3896b7aa16a8dda8910293ca4095976756d95c532ee740e2aaf479937c941abdbb SHA512 a0e4adcd90d64eccebc58538dfb174c9ce6383f2dec4a3209f9fd11f44eee0b80c229a86be9c6ce1fe96acca5d85759ba114358b24ebac38ccea6bd6c2335964 +EBUILD talloc-2.3.2.ebuild 3371 BLAKE2B 3aba9d4a7982d0b2a7bddc1cd94b07fb6a2b652e2d23b704c43c901eb0e8123b78a6e5db2d41f83024cdc2234dff8b8e6c2bd6e2a356679660ed914ed5a182c8 SHA512 8a767d540f1aa7e4b5b33b45a5077f725cbe9eda7509f38ee7c0d97ac73b3093df30b31b77564e1898dbb643f3eb42951d1d5bd7f9cda0dafd8963786ce15930 +EBUILD talloc-2.3.3.ebuild 3380 BLAKE2B 4ea5ed11be1e74b1628be947d788bcb180640a8693b43596176efc3b60532783de0118f948afc34434f657e72fe5103857cc2667e7cf8dc27fcb6ad046ceed86 SHA512 f3e1f31da47d8ca3f5875f362d3ec6920cb1fe4663b50571c5c6f9aefa28366c3152b8c0c1809b27c72eff76f896725c12a8b8387e6d04329ff3fbbce85b370c MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f diff --git a/sys-libs/talloc/talloc-2.3.2.ebuild b/sys-libs/talloc/talloc-2.3.2.ebuild index 851fdbb724c4..6d991fb90858 100644 --- a/sys-libs/talloc/talloc-2.3.2.ebuild +++ b/sys-libs/talloc/talloc-2.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,15 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" RDEPEND=" - !elibc_FreeBSD? ( - !elibc_SunOS? ( - !elibc_Darwin? ( - dev-libs/libbsd[${MULTILIB_USEDEP}] - ) + !elibc_SunOS? ( + !elibc_Darwin? ( + dev-libs/libbsd[${MULTILIB_USEDEP}] ) ) python? ( ${PYTHON_DEPS} ) - !! - -diff --git a/utils/ldconfig.c b/utils/ldconfig.c -index 58939d689..e6b788118 100644 ---- a/utils/ldconfig.c -+++ b/utils/ldconfig.c -@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int expected_type, - res = readsoname32(name, infile, expected_type, type); - else { - res = readsoname64(name, infile, expected_type, type); -- -- // For 64-bit glibc compatibility -- *type |= FLAG_X8664_LIB64; -+#if 0 -+ /* relies on multilib support which we dont have ... */ -+ *type |= LIB_ELF64; -+#endif - } - - return res; -@@ -757,7 +758,7 @@ void cache_print(void) - - for (fd = 0; fd < header->nlibs; fd++) { - printf("\t%s ", strs + libent[fd].sooffset); -- switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) { -+ switch (libent[fd].flags & ~LIB_ELF64) { - case LIB_DLL: - printf("(libc4)"); - break; -@@ -770,7 +771,7 @@ void cache_print(void) - case LIB_ELF_LIBC5: - case LIB_ELF_LIBC6: - printf("(libc%d%s)", -- (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) + 3, -+ (libent[fd].flags & ~LIB_ELF64) + 3, - libent[fd].flags & LIB_ELF64 ? "/64" : ""); - break; - default: diff --git a/sys-libs/uclibc-ng/metadata.xml b/sys-libs/uclibc-ng/metadata.xml deleted file mode 100644 index 6d1928f173d8..000000000000 --- a/sys-libs/uclibc-ng/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - blueness@gentoo.org - Anthony G. Basile - - - embedded@gentoo.org - Embedded Gentoo - - - uClibc-ng is a small C library for developing embedded Linux systems. It is much - smaller than the GNU C Library, but nearly all applications supported by glibc - also work perfectly with uClibc-ng. - - - Explicitly add sym links for libdl.so.0, libm.so.0, and - friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier - - diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild deleted file mode 100644 index 375d030fc404..000000000000 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild +++ /dev/null @@ -1,403 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic multilib savedconfig toolchain-funcs versionator - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" - inherit git-r3 - MY_P=uclibc-ng-${PV} -else - MY_P=uClibc-ng-${PV} -fi - -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="https://uclibc-ng.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" - KEYWORDS="-* arm" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug hardened iconv ipv6 symlink-compat headers-only" -# tests fail due to unusual makefile -RESTRICT="strip test" - -# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage -# will delete the ld.so sym link prematurely and break the system. So we -# will hard block and give manual migration instructions. -# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using -# the breakout library. The disadvantage here is that we have to sprinkle -# LDFAGS=-liconv on build systems that need to link against libiconv. -RDEPEND=" - !!sys-libs/uclibc - iconv? ( dev-libs/libiconv )" - -S=${WORKDIR}/${MY_P} - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CHOST} == ${CTARGET} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then - echo /usr/include - else - echo /usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use headers-only && is_crosscompile -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "BIG";; - *" LSB "*) echo "LITTLE";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -kconfig_q_opt() { - local flag=$1; shift - case ${flag} in - y|n) ;; - *) flag=$(usex ${flag} y n) ;; - esac - - local var="defs_${flag}" - eval "${var}+=( $* )" -} - -get_opt() { - ( - unset ${1} - . ${2:-"${S}"/.config} - echo ${!1} - ) -} - -make_oldconfig() { - yes "" 2>/dev/null | emake -s oldconfig >/dev/null -} - -make_config() { - restore_config .config - if [ -f .config ]; then - make_oldconfig - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - emake ARCH=$1 defconfig >/dev/null - - local defs_{y,n} - - # These are forced off - defs_n=( - DOASSERTS - DODEBUG_PT - HAS_NO_THREADS - PROPOLICE_BLOCK_ABRT - SSP_QUICK_CANARY - SUPPORT_LD_DEBUG_EARLY - UCLIBC_HAS_CTYPE_UNSAFE - UCLIBC_HAS_LOCALE - LDSO_SAFE_RUNPATH - ) - - # These are forced on - defs_y=( - DO_C99_MATH - DO_XSI_MATH - FORCE_SHAREABLE_TEXT_SEGMENTS - LDSO_GNU_HASH_SUPPORT - LDSO_PRELOAD_FILE_SUPPORT - LDSO_RUNPATH - LDSO_RUNPATH_OF_EXECUTABLE - LDSO_STANDALONE_SUPPORT - PROPOLICE_BLOCK_SEGV - PTHREADS_DEBUG_SUPPORT - UCLIBC_HAS_ARC4RANDOM - UCLIBC_HAS_BACKTRACE - UCLIBC_HAS_BSD_RES_CLOSE - UCLIBC_HAS_CONTEXT_FUNCS - UCLIBC_HAS_CTYPE_CHECKED - UCLIBC_HAS_EXTRA_COMPAT_RES_STATE - UCLIBC_HAS_FENV - UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE - UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE - UCLIBC_HAS_FOPEN_LARGEFILE_MODE - UCLIBC_HAS_FTS - UCLIBC_HAS_FTW - UCLIBC_HAS_GETPT - UCLIBC_HAS_GLIBC_CUSTOM_PRINTF - UCLIBC_HAS_GLIBC_CUSTOM_STREAMS - UCLIBC_HAS_GNU_GLOB - UCLIBC_HAS_HEXADECIMAL_FLOATS - UCLIBC_HAS_LIBUTIL - UCLIBC_HAS_NFTW - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL - UCLIBC_HAS_PRINTF_M_SPEC - UCLIBC_HAS_PROGRAM_INVOCATION_NAME - UCLIBC_HAS_RESOLVER_SUPPORT - UCLIBC_HAS_SHA256_CRYPT_IMPL - UCLIBC_HAS_SHA512_CRYPT_IMPL - UCLIBC_HAS_SSP - UCLIBC_HAS_STUBS - UCLIBC_HAS_SYS_ERRLIST - UCLIBC_HAS_SYS_SIGLIST - UCLIBC_HAS_THREADS_NATIVE - UCLIBC_HAS_TZ_FILE_READ_MANY - UCLIBC_HAS_UTMP - UCLIBC_HAS_UTMPX - UCLIBC_HAS_WCHAR - UCLIBC_HAS_WORDEXP - UCLIBC_NTP_LEGACY - UCLIBC_SUPPORT_AI_ADDRCONFIG - UCLIBC_SUSV2_LEGACY - UCLIBC_SUSV3_LEGACY - UCLIBC_SUSV3_LEGACY_MACROS - UCLIBC_SUSV4_LEGACY - UCLIBC_USE_NETLINK - ) - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" - - kconfig_q_opt debug DODEBUG - kconfig_q_opt debug SUPPORT_LD_DEBUG - kconfig_q_opt debug UCLIBC_HAS_PROFILING - - kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 - - kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK - kconfig_q_opt hardened UCLIBC_BUILD_NOW - kconfig_q_opt hardened UCLIBC_BUILD_PIE - kconfig_q_opt hardened UCLIBC_BUILD_RELRO - kconfig_q_opt hardened UCLIBC_BUILD_SSP - - local count def - for count in 1 2 ; do - # Run twice as some config opts depend on others being enabled first. - for def in ${defs_y[@]} ; do - sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config - done - for def in ${defs_n[@]} ; do - sed -i -e "s|${def}=y|# ${def} is not set|g" .config - done - make_oldconfig - done - - einfo "Enabled options:" - for def in ${defs_y[@]} ; do - einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") - done - einfo "Disabled options:" - for def in ${defs_n[@]} ; do - einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") - done - - # setup build and run paths - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \ - -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \ - -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \ - -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \ - .config || die - - make_oldconfig -} - -pkg_setup() { - # Make sure our CHOST is a uclibc toolchain for native compiling - if [[ ${CHOST} == ${CTARGET} ]]; then - case ${CHOST} in - *-uclinux*|*-uclibc*) ;; - *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; - esac - fi - - # uClibc-ng doesn't carry old Linux threads, and since we force - # threading our only choice is NPTL which requires i486 and later. - [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)." -} - -src_prepare() { - local version subversion extraversion - - # uclibc-ng tries to create a two sym link with ld.so, - # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so - # where MAJOR_VERSION != 0 indicates the ABI verison. - # We want to get rid of this and just have ABI = 0. - eapply "${FILESDIR}"/uclibc-compat-r1.patch - - # Critical fix for ld.so.cache - eapply "${FILESDIR}"/${P}-fix-ld.so.cache.patch - - # We need to change the major.minor.sublevel of uclibc-ng. - # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. - # If we really want the ABI bump, we'll have to hack the gcc - # spec file and change the '*link:' rule. - version=( $(get_version_components) ) - if [[ -z ${version[1]} ]]; then - subversion=0 - extraversion=0 - else - subversion=${version[1]} - if [[ -z ${version[2]} ]]; then - extraversion=0 - else - extraversion=.${version[2]} - fi - fi - - sed -i \ - -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ - -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \ - -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ - -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ - Rules.mak || die - - eapply_user -} - -src_configure() { - # Map our toolchain arch name to the name expected by uClibc-ng. - local target=$(tc-arch) - case ${target} in - amd64) target="x86_64";; - arm) target="arm";; - mips) target="mips";; - ppc) target="powerpc";; - x86) target="i386";; - esac - - # Do arch specific configuration by changing the defaults in - # extra/Configs/Config.. If these are not overridden - # by an save .config, they will be selected by default. - - # For i386, i486, i586 and i686 - local cpu - if [[ ${target} == "i386" ]]; then - [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86" - sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \ - extra/Configs/Config.i386 || die - fi - - # For arm - if [[ ${target} == "arm" ]]; then - sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm - fi - - # We set HOSTCC to the proper tuple rather than just 'gcc' - sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak - - make_config ${target} - - einfo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "ABI: ${ABI}" - einfo "ENDIAN: $(uclibc_endian)" - einfo -} - -src_compile() { - emake headers - just_headers && return 0 - - emake - if is_crosscompile ; then - emake -C utils hostutils - else - emake utils - fi -} - -src_test() { - is_crosscompile && return 0 - - # assert test fails on pax/grsec enabled kernels - # normal vfork test fails in sandbox (both glibc/uclibc) - emake UCLIBC_ONLY=1 check -} - -src_install() { - local sysroot=${D} - is_crosscompile && sysroot+="/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig - newbin utils/ldd.host ${CTARGET}-ldd - fi - return 0 - fi - - if use symlink-compat; then - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0 - fi - - emake DESTDIR="${D}" install_utils - dobin extra/scripts/getent - dodoc README docs/*.txt -} - -pkg_postinst() { - is_crosscompile && return 0 - - if [ ! -e "${ROOT}"/etc/TZ ] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - [ "${ROOT}" != "/" ] && return 0 - # update cache before reloading init - ldconfig -} diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild deleted file mode 100644 index fffc7f103fb8..000000000000 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild +++ /dev/null @@ -1,402 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic multilib savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" - inherit git-r3 - MY_P=uclibc-ng-${PV} -else - MY_P=uClibc-ng-${PV} -fi - -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="https://uclibc-ng.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" - KEYWORDS="-* amd64 ~mips ppc x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug hardened iconv ipv6 symlink-compat headers-only" -# tests fail due to unusual makefile -RESTRICT="strip test" - -# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage -# will delete the ld.so sym link prematurely and break the system. So we -# will hard block and give manual migration instructions. -# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using -# the breakout library. The disadvantage here is that we have to sprinkle -# LDFAGS=-liconv on build systems that need to link against libiconv. -RDEPEND=" - !!sys-libs/uclibc - iconv? ( dev-libs/libiconv )" - -S=${WORKDIR}/${MY_P} - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CHOST} == ${CTARGET} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then - echo /usr/include - else - echo /usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use headers-only && is_crosscompile -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "BIG";; - *" LSB "*) echo "LITTLE";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -kconfig_q_opt() { - local flag=$1; shift - case ${flag} in - y|n) ;; - *) flag=$(usex ${flag} y n) ;; - esac - - local var="defs_${flag}" - eval "${var}+=( $* )" -} - -get_opt() { - ( - unset ${1} - . ${2:-"${S}"/.config} - echo ${!1} - ) -} - -make_oldconfig() { - yes "" 2>/dev/null | emake -s oldconfig >/dev/null -} - -make_config() { - restore_config .config - if [ -f .config ]; then - make_oldconfig - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - emake ARCH=$1 defconfig >/dev/null - - local defs_{y,n} - - # These are forced off - defs_n=( - DOASSERTS - DODEBUG_PT - HAS_NO_THREADS - PROPOLICE_BLOCK_ABRT - SSP_QUICK_CANARY - SUPPORT_LD_DEBUG_EARLY - UCLIBC_HAS_CTYPE_UNSAFE - UCLIBC_HAS_LOCALE - LDSO_SAFE_RUNPATH - ) - - # These are forced on - defs_y=( - DO_C99_MATH - DO_XSI_MATH - FORCE_SHAREABLE_TEXT_SEGMENTS - LDSO_GNU_HASH_SUPPORT - LDSO_PRELOAD_FILE_SUPPORT - LDSO_RUNPATH - LDSO_RUNPATH_OF_EXECUTABLE - LDSO_STANDALONE_SUPPORT - PROPOLICE_BLOCK_SEGV - PTHREADS_DEBUG_SUPPORT - UCLIBC_HAS_ARC4RANDOM - UCLIBC_HAS_BACKTRACE - UCLIBC_HAS_BSD_RES_CLOSE - UCLIBC_HAS_CONTEXT_FUNCS - UCLIBC_HAS_CTYPE_CHECKED - UCLIBC_HAS_EXTRA_COMPAT_RES_STATE - UCLIBC_HAS_FENV - UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE - UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE - UCLIBC_HAS_FOPEN_LARGEFILE_MODE - UCLIBC_HAS_FTS - UCLIBC_HAS_FTW - UCLIBC_HAS_GETPT - UCLIBC_HAS_GLIBC_CUSTOM_PRINTF - UCLIBC_HAS_GLIBC_CUSTOM_STREAMS - UCLIBC_HAS_GNU_GLOB - UCLIBC_HAS_HEXADECIMAL_FLOATS - UCLIBC_HAS_LIBUTIL - UCLIBC_HAS_NFTW - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL - UCLIBC_HAS_PRINTF_M_SPEC - UCLIBC_HAS_PROGRAM_INVOCATION_NAME - UCLIBC_HAS_RESOLVER_SUPPORT - UCLIBC_HAS_SHA256_CRYPT_IMPL - UCLIBC_HAS_SHA512_CRYPT_IMPL - UCLIBC_HAS_SSP - UCLIBC_HAS_STUBS - UCLIBC_HAS_SYS_ERRLIST - UCLIBC_HAS_SYS_SIGLIST - UCLIBC_HAS_THREADS_NATIVE - UCLIBC_HAS_TZ_FILE_READ_MANY - UCLIBC_HAS_UTMP - UCLIBC_HAS_UTMPX - UCLIBC_HAS_WCHAR - UCLIBC_HAS_WORDEXP - UCLIBC_NTP_LEGACY - UCLIBC_SUPPORT_AI_ADDRCONFIG - UCLIBC_SUSV2_LEGACY - UCLIBC_SUSV3_LEGACY - UCLIBC_SUSV3_LEGACY_MACROS - UCLIBC_SUSV4_LEGACY - UCLIBC_USE_NETLINK - ) - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" - - kconfig_q_opt debug DODEBUG - kconfig_q_opt debug SUPPORT_LD_DEBUG - kconfig_q_opt debug UCLIBC_HAS_PROFILING - - kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 - - kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK - kconfig_q_opt hardened UCLIBC_BUILD_NOW - kconfig_q_opt hardened UCLIBC_BUILD_PIE - kconfig_q_opt hardened UCLIBC_BUILD_RELRO - kconfig_q_opt hardened UCLIBC_BUILD_SSP - - local count def - for count in 1 2 ; do - # Run twice as some config opts depend on others being enabled first. - for def in ${defs_y[@]} ; do - sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config - done - for def in ${defs_n[@]} ; do - sed -i -e "s|${def}=y|# ${def} is not set|g" .config - done - make_oldconfig - done - - einfo "Enabled options:" - for def in ${defs_y[@]} ; do - einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") - done - einfo "Disabled options:" - for def in ${defs_n[@]} ; do - einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") - done - - # setup build and run paths - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \ - -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \ - -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \ - -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \ - .config || die - - make_oldconfig -} - -pkg_setup() { - # Make sure our CHOST is a uclibc toolchain for native compiling - if [[ ${CHOST} == ${CTARGET} ]]; then - case ${CHOST} in - *-uclinux*|*-uclibc*) ;; - *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; - esac - fi - - # uClibc-ng doesn't carry old Linux threads, and since we force - # threading our only choice is NPTL which requires i486 and later. - [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)." -} - -src_prepare() { - local version subversion extraversion - - # uclibc-ng tries to create a two sym link with ld.so, - # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so - # where MAJOR_VERSION != 0 indicates the ABI verison. - # We want to get rid of this and just have ABI = 0. - eapply "${FILESDIR}"/uclibc-compat-r1.patch - - # We need to change the major.minor.sublevel of uclibc-ng. - # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. - # If we really want the ABI bump, we'll have to hack the gcc - # spec file and change the '*link:' rule. - version_0=$(ver_cut 1) - version_1=$(ver_cut 2) - version_2=$(ver_cut 3) - if [[ -z ${version_1} ]]; then - subversion=0 - extraversion=0 - else - subversion=${version_1} - if [[ -z ${version_2} ]]; then - extraversion=0 - else - extraversion=.${version_2} - fi - fi - - sed -i \ - -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ - -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \ - -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ - -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ - Rules.mak || die - - eapply_user -} - -src_configure() { - # Map our toolchain arch name to the name expected by uClibc-ng. - local target=$(tc-arch) - case ${target} in - amd64) target="x86_64";; - arm) target="arm";; - mips) target="mips";; - ppc) target="powerpc";; - x86) target="i386";; - esac - - # Do arch specific configuration by changing the defaults in - # extra/Configs/Config.. If these are not overridden - # by an save .config, they will be selected by default. - - # For i386, i486, i586 and i686 - local cpu - if [[ ${target} == "i386" ]]; then - [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86" - sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \ - extra/Configs/Config.i386 || die - fi - - # For arm - if [[ ${target} == "arm" ]]; then - sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm - fi - - # We set HOSTCC to the proper tuple rather than just 'gcc' - sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak - - make_config ${target} - - einfo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "ABI: ${ABI}" - einfo "ENDIAN: $(uclibc_endian)" - einfo -} - -src_compile() { - emake headers - just_headers && return 0 - - emake - if is_crosscompile ; then - emake -C utils hostutils - else - emake utils - fi -} - -src_test() { - is_crosscompile && return 0 - - # assert test fails on pax/grsec enabled kernels - # normal vfork test fails in sandbox (both glibc/uclibc) - emake UCLIBC_ONLY=1 check -} - -src_install() { - local sysroot=${D} - is_crosscompile && sysroot+="/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig - newbin utils/ldd.host ${CTARGET}-ldd - fi - return 0 - fi - - if use symlink-compat; then - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0 - fi - - emake DESTDIR="${D}" install_utils - dobin extra/scripts/getent - dodoc README docs/*.txt -} - -pkg_postinst() { - is_crosscompile && return 0 - - if [ ! -e "${ROOT}"/etc/TZ ] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - [ "${ROOT}" != "/" ] && return 0 - # update cache before reloading init - ldconfig -} diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild deleted file mode 100644 index 4dd7db70cc0f..000000000000 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild +++ /dev/null @@ -1,402 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic multilib savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" - inherit git-r3 - MY_P=uclibc-ng-${PV} -else - MY_P=uClibc-ng-${PV} -fi - -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="https://uclibc-ng.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" - KEYWORDS="-* amd64 ~arm ~mips ~ppc x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug hardened iconv ipv6 symlink-compat headers-only" -# tests fail due to unusual makefile -RESTRICT="strip test" - -# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage -# will delete the ld.so sym link prematurely and break the system. So we -# will hard block and give manual migration instructions. -# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using -# the breakout library. The disadvantage here is that we have to sprinkle -# LDFAGS=-liconv on build systems that need to link against libiconv. -RDEPEND=" - !!sys-libs/uclibc - iconv? ( dev-libs/libiconv )" - -S=${WORKDIR}/${MY_P} - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CHOST} == ${CTARGET} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then - echo /usr/include - else - echo /usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use headers-only && is_crosscompile -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "BIG";; - *" LSB "*) echo "LITTLE";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -kconfig_q_opt() { - local flag=$1; shift - case ${flag} in - y|n) ;; - *) flag=$(usex ${flag} y n) ;; - esac - - local var="defs_${flag}" - eval "${var}+=( $* )" -} - -get_opt() { - ( - unset ${1} - . ${2:-"${S}"/.config} - echo ${!1} - ) -} - -make_oldconfig() { - yes "" 2>/dev/null | emake -s oldconfig >/dev/null -} - -make_config() { - restore_config .config - if [ -f .config ]; then - make_oldconfig - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - emake ARCH=$1 defconfig >/dev/null - - local defs_{y,n} - - # These are forced off - defs_n=( - DOASSERTS - DODEBUG_PT - HAS_NO_THREADS - PROPOLICE_BLOCK_ABRT - SSP_QUICK_CANARY - SUPPORT_LD_DEBUG_EARLY - UCLIBC_HAS_CTYPE_UNSAFE - UCLIBC_HAS_LOCALE - LDSO_SAFE_RUNPATH - ) - - # These are forced on - defs_y=( - DO_C99_MATH - DO_XSI_MATH - FORCE_SHAREABLE_TEXT_SEGMENTS - LDSO_GNU_HASH_SUPPORT - LDSO_PRELOAD_FILE_SUPPORT - LDSO_RUNPATH - LDSO_RUNPATH_OF_EXECUTABLE - LDSO_STANDALONE_SUPPORT - PROPOLICE_BLOCK_SEGV - PTHREADS_DEBUG_SUPPORT - UCLIBC_HAS_ARC4RANDOM - UCLIBC_HAS_BACKTRACE - UCLIBC_HAS_BSD_RES_CLOSE - UCLIBC_HAS_CONTEXT_FUNCS - UCLIBC_HAS_CTYPE_CHECKED - UCLIBC_HAS_EXTRA_COMPAT_RES_STATE - UCLIBC_HAS_FENV - UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE - UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE - UCLIBC_HAS_FOPEN_LARGEFILE_MODE - UCLIBC_HAS_FTS - UCLIBC_HAS_FTW - UCLIBC_HAS_GETPT - UCLIBC_HAS_GLIBC_CUSTOM_PRINTF - UCLIBC_HAS_GLIBC_CUSTOM_STREAMS - UCLIBC_HAS_GNU_GLOB - UCLIBC_HAS_HEXADECIMAL_FLOATS - UCLIBC_HAS_LIBUTIL - UCLIBC_HAS_NFTW - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL - UCLIBC_HAS_PRINTF_M_SPEC - UCLIBC_HAS_PROGRAM_INVOCATION_NAME - UCLIBC_HAS_RESOLVER_SUPPORT - UCLIBC_HAS_SHA256_CRYPT_IMPL - UCLIBC_HAS_SHA512_CRYPT_IMPL - UCLIBC_HAS_SSP - UCLIBC_HAS_STUBS - UCLIBC_HAS_SYS_ERRLIST - UCLIBC_HAS_SYS_SIGLIST - UCLIBC_HAS_THREADS_NATIVE - UCLIBC_HAS_TZ_FILE_READ_MANY - UCLIBC_HAS_UTMP - UCLIBC_HAS_UTMPX - UCLIBC_HAS_WCHAR - UCLIBC_HAS_WORDEXP - UCLIBC_NTP_LEGACY - UCLIBC_SUPPORT_AI_ADDRCONFIG - UCLIBC_SUSV2_LEGACY - UCLIBC_SUSV3_LEGACY - UCLIBC_SUSV3_LEGACY_MACROS - UCLIBC_SUSV4_LEGACY - UCLIBC_USE_NETLINK - ) - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" - - kconfig_q_opt debug DODEBUG - kconfig_q_opt debug SUPPORT_LD_DEBUG - kconfig_q_opt debug UCLIBC_HAS_PROFILING - - kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 - - kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK - kconfig_q_opt hardened UCLIBC_BUILD_NOW - kconfig_q_opt hardened UCLIBC_BUILD_PIE - kconfig_q_opt hardened UCLIBC_BUILD_RELRO - kconfig_q_opt hardened UCLIBC_BUILD_SSP - - local count def - for count in 1 2 ; do - # Run twice as some config opts depend on others being enabled first. - for def in ${defs_y[@]} ; do - sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config - done - for def in ${defs_n[@]} ; do - sed -i -e "s|${def}=y|# ${def} is not set|g" .config - done - make_oldconfig - done - - einfo "Enabled options:" - for def in ${defs_y[@]} ; do - einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") - done - einfo "Disabled options:" - for def in ${defs_n[@]} ; do - einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") - done - - # setup build and run paths - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \ - -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \ - -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \ - -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \ - .config || die - - make_oldconfig -} - -pkg_setup() { - # Make sure our CHOST is a uclibc toolchain for native compiling - if [[ ${CHOST} == ${CTARGET} ]]; then - case ${CHOST} in - *-uclinux*|*-uclibc*) ;; - *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; - esac - fi - - # uClibc-ng doesn't carry old Linux threads, and since we force - # threading our only choice is NPTL which requires i486 and later. - [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)." -} - -src_prepare() { - local version subversion extraversion - - # uclibc-ng tries to create a two sym link with ld.so, - # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so - # where MAJOR_VERSION != 0 indicates the ABI verison. - # We want to get rid of this and just have ABI = 0. - eapply "${FILESDIR}"/uclibc-compat-r1.patch - - # We need to change the major.minor.sublevel of uclibc-ng. - # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. - # If we really want the ABI bump, we'll have to hack the gcc - # spec file and change the '*link:' rule. - version_0=$(ver_cut 1) - version_1=$(ver_cut 2) - version_2=$(ver_cut 3) - if [[ -z ${version_1} ]]; then - subversion=0 - extraversion=0 - else - subversion=${version_1} - if [[ -z ${version_2} ]]; then - extraversion=0 - else - extraversion=.${version_2} - fi - fi - - sed -i \ - -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ - -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \ - -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ - -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ - Rules.mak || die - - eapply_user -} - -src_configure() { - # Map our toolchain arch name to the name expected by uClibc-ng. - local target=$(tc-arch) - case ${target} in - amd64) target="x86_64";; - arm) target="arm";; - mips) target="mips";; - ppc) target="powerpc";; - x86) target="i386";; - esac - - # Do arch specific configuration by changing the defaults in - # extra/Configs/Config.. If these are not overridden - # by an save .config, they will be selected by default. - - # For i386, i486, i586 and i686 - local cpu - if [[ ${target} == "i386" ]]; then - [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86" - sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \ - extra/Configs/Config.i386 || die - fi - - # For arm - if [[ ${target} == "arm" ]]; then - sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm - fi - - # We set HOSTCC to the proper tuple rather than just 'gcc' - sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak - - make_config ${target} - - einfo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "ABI: ${ABI}" - einfo "ENDIAN: $(uclibc_endian)" - einfo -} - -src_compile() { - emake headers - just_headers && return 0 - - emake - if is_crosscompile ; then - emake -C utils hostutils - else - emake utils - fi -} - -src_test() { - is_crosscompile && return 0 - - # assert test fails on pax/grsec enabled kernels - # normal vfork test fails in sandbox (both glibc/uclibc) - emake UCLIBC_ONLY=1 check -} - -src_install() { - local sysroot=${D} - is_crosscompile && sysroot+="/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig - newbin utils/ldd.host ${CTARGET}-ldd - fi - return 0 - fi - - if use symlink-compat; then - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0 - fi - - emake DESTDIR="${D}" install_utils - dobin extra/scripts/getent - dodoc README docs/*.txt -} - -pkg_postinst() { - is_crosscompile && return 0 - - if [ ! -e "${ROOT}"/etc/TZ ] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - [ "${ROOT}" != "/" ] && return 0 - # update cache before reloading init - ldconfig -} diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild deleted file mode 100644 index 5ef7e61a3a91..000000000000 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild +++ /dev/null @@ -1,402 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic multilib savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" - inherit git-r3 - MY_P=uclibc-ng-${PV} -else - MY_P=uClibc-ng-${PV} -fi - -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="https://uclibc-ng.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" - KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug hardened iconv ipv6 symlink-compat headers-only" -# tests fail due to unusual makefile -RESTRICT="strip test" - -# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage -# will delete the ld.so sym link prematurely and break the system. So we -# will hard block and give manual migration instructions. -# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using -# the breakout library. The disadvantage here is that we have to sprinkle -# LDFAGS=-liconv on build systems that need to link against libiconv. -RDEPEND=" - !!sys-libs/uclibc - iconv? ( dev-libs/libiconv )" - -S=${WORKDIR}/${MY_P} - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CHOST} == ${CTARGET} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then - echo /usr/include - else - echo /usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use headers-only && is_crosscompile -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "BIG";; - *" LSB "*) echo "LITTLE";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -kconfig_q_opt() { - local flag=$1; shift - case ${flag} in - y|n) ;; - *) flag=$(usex ${flag} y n) ;; - esac - - local var="defs_${flag}" - eval "${var}+=( $* )" -} - -get_opt() { - ( - unset ${1} - . ${2:-"${S}"/.config} - echo ${!1} - ) -} - -make_oldconfig() { - yes "" 2>/dev/null | emake -s oldconfig >/dev/null -} - -make_config() { - restore_config .config - if [ -f .config ]; then - make_oldconfig - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - emake ARCH=$1 defconfig >/dev/null - - local defs_{y,n} - - # These are forced off - defs_n=( - DOASSERTS - DODEBUG_PT - HAS_NO_THREADS - PROPOLICE_BLOCK_ABRT - SSP_QUICK_CANARY - SUPPORT_LD_DEBUG_EARLY - UCLIBC_HAS_CTYPE_UNSAFE - UCLIBC_HAS_LOCALE - LDSO_SAFE_RUNPATH - ) - - # These are forced on - defs_y=( - DO_C99_MATH - DO_XSI_MATH - FORCE_SHAREABLE_TEXT_SEGMENTS - LDSO_GNU_HASH_SUPPORT - LDSO_PRELOAD_FILE_SUPPORT - LDSO_RUNPATH - LDSO_RUNPATH_OF_EXECUTABLE - LDSO_STANDALONE_SUPPORT - PROPOLICE_BLOCK_SEGV - PTHREADS_DEBUG_SUPPORT - UCLIBC_HAS_ARC4RANDOM - UCLIBC_HAS_BACKTRACE - UCLIBC_HAS_BSD_RES_CLOSE - UCLIBC_HAS_CONTEXT_FUNCS - UCLIBC_HAS_CTYPE_CHECKED - UCLIBC_HAS_EXTRA_COMPAT_RES_STATE - UCLIBC_HAS_FENV - UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE - UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE - UCLIBC_HAS_FOPEN_LARGEFILE_MODE - UCLIBC_HAS_FTS - UCLIBC_HAS_FTW - UCLIBC_HAS_GETPT - UCLIBC_HAS_GLIBC_CUSTOM_PRINTF - UCLIBC_HAS_GLIBC_CUSTOM_STREAMS - UCLIBC_HAS_GNU_GLOB - UCLIBC_HAS_HEXADECIMAL_FLOATS - UCLIBC_HAS_LIBUTIL - UCLIBC_HAS_NFTW - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL - UCLIBC_HAS_PRINTF_M_SPEC - UCLIBC_HAS_PROGRAM_INVOCATION_NAME - UCLIBC_HAS_RESOLVER_SUPPORT - UCLIBC_HAS_SHA256_CRYPT_IMPL - UCLIBC_HAS_SHA512_CRYPT_IMPL - UCLIBC_HAS_SSP - UCLIBC_HAS_STUBS - UCLIBC_HAS_SYS_ERRLIST - UCLIBC_HAS_SYS_SIGLIST - UCLIBC_HAS_THREADS_NATIVE - UCLIBC_HAS_TZ_FILE_READ_MANY - UCLIBC_HAS_UTMP - UCLIBC_HAS_UTMPX - UCLIBC_HAS_WCHAR - UCLIBC_HAS_WORDEXP - UCLIBC_NTP_LEGACY - UCLIBC_SUPPORT_AI_ADDRCONFIG - UCLIBC_SUSV2_LEGACY - UCLIBC_SUSV3_LEGACY - UCLIBC_SUSV3_LEGACY_MACROS - UCLIBC_SUSV4_LEGACY - UCLIBC_USE_NETLINK - ) - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" - - kconfig_q_opt debug DODEBUG - kconfig_q_opt debug SUPPORT_LD_DEBUG - kconfig_q_opt debug UCLIBC_HAS_PROFILING - - kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 - - kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK - kconfig_q_opt hardened UCLIBC_BUILD_NOW - kconfig_q_opt hardened UCLIBC_BUILD_PIE - kconfig_q_opt hardened UCLIBC_BUILD_RELRO - kconfig_q_opt hardened UCLIBC_BUILD_SSP - - local count def - for count in 1 2 ; do - # Run twice as some config opts depend on others being enabled first. - for def in ${defs_y[@]} ; do - sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config - done - for def in ${defs_n[@]} ; do - sed -i -e "s|${def}=y|# ${def} is not set|g" .config - done - make_oldconfig - done - - einfo "Enabled options:" - for def in ${defs_y[@]} ; do - einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") - done - einfo "Disabled options:" - for def in ${defs_n[@]} ; do - einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") - done - - # setup build and run paths - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \ - -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \ - -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \ - -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \ - .config || die - - make_oldconfig -} - -pkg_setup() { - # Make sure our CHOST is a uclibc toolchain for native compiling - if [[ ${CHOST} == ${CTARGET} ]]; then - case ${CHOST} in - *-uclinux*|*-uclibc*) ;; - *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; - esac - fi - - # uClibc-ng doesn't carry old Linux threads, and since we force - # threading our only choice is NPTL which requires i486 and later. - [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)." -} - -src_prepare() { - local version subversion extraversion - - # uclibc-ng tries to create a two sym link with ld.so, - # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so - # where MAJOR_VERSION != 0 indicates the ABI verison. - # We want to get rid of this and just have ABI = 0. - eapply "${FILESDIR}"/uclibc-compat-r1.patch - - # We need to change the major.minor.sublevel of uclibc-ng. - # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. - # If we really want the ABI bump, we'll have to hack the gcc - # spec file and change the '*link:' rule. - version_0=$(ver_cut 1) - version_1=$(ver_cut 2) - version_2=$(ver_cut 3) - if [[ -z ${version_1} ]]; then - subversion=0 - extraversion=0 - else - subversion=${version_1} - if [[ -z ${version_2} ]]; then - extraversion=0 - else - extraversion=.${version_2} - fi - fi - - sed -i \ - -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ - -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \ - -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ - -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ - Rules.mak || die - - eapply_user -} - -src_configure() { - # Map our toolchain arch name to the name expected by uClibc-ng. - local target=$(tc-arch) - case ${target} in - amd64) target="x86_64";; - arm) target="arm";; - mips) target="mips";; - ppc) target="powerpc";; - x86) target="i386";; - esac - - # Do arch specific configuration by changing the defaults in - # extra/Configs/Config.. If these are not overridden - # by an save .config, they will be selected by default. - - # For i386, i486, i586 and i686 - local cpu - if [[ ${target} == "i386" ]]; then - [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86" - sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \ - extra/Configs/Config.i386 || die - fi - - # For arm - if [[ ${target} == "arm" ]]; then - sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm - fi - - # We set HOSTCC to the proper tuple rather than just 'gcc' - sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak - - make_config ${target} - - einfo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "ABI: ${ABI}" - einfo "ENDIAN: $(uclibc_endian)" - einfo -} - -src_compile() { - emake headers - just_headers && return 0 - - emake - if is_crosscompile ; then - emake -C utils hostutils - else - emake utils - fi -} - -src_test() { - is_crosscompile && return 0 - - # assert test fails on pax/grsec enabled kernels - # normal vfork test fails in sandbox (both glibc/uclibc) - emake UCLIBC_ONLY=1 check -} - -src_install() { - local sysroot=${D} - is_crosscompile && sysroot+="/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig - newbin utils/ldd.host ${CTARGET}-ldd - fi - return 0 - fi - - if use symlink-compat; then - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0 - fi - - emake DESTDIR="${D}" install_utils - dobin extra/scripts/getent - dodoc README docs/*.txt -} - -pkg_postinst() { - is_crosscompile && return 0 - - if [ ! -e "${ROOT}"/etc/TZ ] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - [ "${ROOT}" != "/" ] && return 0 - # update cache before reloading init - ldconfig -} diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild deleted file mode 100644 index 5ef7e61a3a91..000000000000 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild +++ /dev/null @@ -1,402 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic multilib savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" - inherit git-r3 - MY_P=uclibc-ng-${PV} -else - MY_P=uClibc-ng-${PV} -fi - -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="https://uclibc-ng.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" - KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug hardened iconv ipv6 symlink-compat headers-only" -# tests fail due to unusual makefile -RESTRICT="strip test" - -# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage -# will delete the ld.so sym link prematurely and break the system. So we -# will hard block and give manual migration instructions. -# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using -# the breakout library. The disadvantage here is that we have to sprinkle -# LDFAGS=-liconv on build systems that need to link against libiconv. -RDEPEND=" - !!sys-libs/uclibc - iconv? ( dev-libs/libiconv )" - -S=${WORKDIR}/${MY_P} - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CHOST} == ${CTARGET} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then - echo /usr/include - else - echo /usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use headers-only && is_crosscompile -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "BIG";; - *" LSB "*) echo "LITTLE";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -kconfig_q_opt() { - local flag=$1; shift - case ${flag} in - y|n) ;; - *) flag=$(usex ${flag} y n) ;; - esac - - local var="defs_${flag}" - eval "${var}+=( $* )" -} - -get_opt() { - ( - unset ${1} - . ${2:-"${S}"/.config} - echo ${!1} - ) -} - -make_oldconfig() { - yes "" 2>/dev/null | emake -s oldconfig >/dev/null -} - -make_config() { - restore_config .config - if [ -f .config ]; then - make_oldconfig - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - emake ARCH=$1 defconfig >/dev/null - - local defs_{y,n} - - # These are forced off - defs_n=( - DOASSERTS - DODEBUG_PT - HAS_NO_THREADS - PROPOLICE_BLOCK_ABRT - SSP_QUICK_CANARY - SUPPORT_LD_DEBUG_EARLY - UCLIBC_HAS_CTYPE_UNSAFE - UCLIBC_HAS_LOCALE - LDSO_SAFE_RUNPATH - ) - - # These are forced on - defs_y=( - DO_C99_MATH - DO_XSI_MATH - FORCE_SHAREABLE_TEXT_SEGMENTS - LDSO_GNU_HASH_SUPPORT - LDSO_PRELOAD_FILE_SUPPORT - LDSO_RUNPATH - LDSO_RUNPATH_OF_EXECUTABLE - LDSO_STANDALONE_SUPPORT - PROPOLICE_BLOCK_SEGV - PTHREADS_DEBUG_SUPPORT - UCLIBC_HAS_ARC4RANDOM - UCLIBC_HAS_BACKTRACE - UCLIBC_HAS_BSD_RES_CLOSE - UCLIBC_HAS_CONTEXT_FUNCS - UCLIBC_HAS_CTYPE_CHECKED - UCLIBC_HAS_EXTRA_COMPAT_RES_STATE - UCLIBC_HAS_FENV - UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE - UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE - UCLIBC_HAS_FOPEN_LARGEFILE_MODE - UCLIBC_HAS_FTS - UCLIBC_HAS_FTW - UCLIBC_HAS_GETPT - UCLIBC_HAS_GLIBC_CUSTOM_PRINTF - UCLIBC_HAS_GLIBC_CUSTOM_STREAMS - UCLIBC_HAS_GNU_GLOB - UCLIBC_HAS_HEXADECIMAL_FLOATS - UCLIBC_HAS_LIBUTIL - UCLIBC_HAS_NFTW - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL - UCLIBC_HAS_PRINTF_M_SPEC - UCLIBC_HAS_PROGRAM_INVOCATION_NAME - UCLIBC_HAS_RESOLVER_SUPPORT - UCLIBC_HAS_SHA256_CRYPT_IMPL - UCLIBC_HAS_SHA512_CRYPT_IMPL - UCLIBC_HAS_SSP - UCLIBC_HAS_STUBS - UCLIBC_HAS_SYS_ERRLIST - UCLIBC_HAS_SYS_SIGLIST - UCLIBC_HAS_THREADS_NATIVE - UCLIBC_HAS_TZ_FILE_READ_MANY - UCLIBC_HAS_UTMP - UCLIBC_HAS_UTMPX - UCLIBC_HAS_WCHAR - UCLIBC_HAS_WORDEXP - UCLIBC_NTP_LEGACY - UCLIBC_SUPPORT_AI_ADDRCONFIG - UCLIBC_SUSV2_LEGACY - UCLIBC_SUSV3_LEGACY - UCLIBC_SUSV3_LEGACY_MACROS - UCLIBC_SUSV4_LEGACY - UCLIBC_USE_NETLINK - ) - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" - - kconfig_q_opt debug DODEBUG - kconfig_q_opt debug SUPPORT_LD_DEBUG - kconfig_q_opt debug UCLIBC_HAS_PROFILING - - kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 - - kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK - kconfig_q_opt hardened UCLIBC_BUILD_NOW - kconfig_q_opt hardened UCLIBC_BUILD_PIE - kconfig_q_opt hardened UCLIBC_BUILD_RELRO - kconfig_q_opt hardened UCLIBC_BUILD_SSP - - local count def - for count in 1 2 ; do - # Run twice as some config opts depend on others being enabled first. - for def in ${defs_y[@]} ; do - sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config - done - for def in ${defs_n[@]} ; do - sed -i -e "s|${def}=y|# ${def} is not set|g" .config - done - make_oldconfig - done - - einfo "Enabled options:" - for def in ${defs_y[@]} ; do - einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") - done - einfo "Disabled options:" - for def in ${defs_n[@]} ; do - einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") - done - - # setup build and run paths - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \ - -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \ - -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \ - -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \ - .config || die - - make_oldconfig -} - -pkg_setup() { - # Make sure our CHOST is a uclibc toolchain for native compiling - if [[ ${CHOST} == ${CTARGET} ]]; then - case ${CHOST} in - *-uclinux*|*-uclibc*) ;; - *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; - esac - fi - - # uClibc-ng doesn't carry old Linux threads, and since we force - # threading our only choice is NPTL which requires i486 and later. - [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)." -} - -src_prepare() { - local version subversion extraversion - - # uclibc-ng tries to create a two sym link with ld.so, - # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so - # where MAJOR_VERSION != 0 indicates the ABI verison. - # We want to get rid of this and just have ABI = 0. - eapply "${FILESDIR}"/uclibc-compat-r1.patch - - # We need to change the major.minor.sublevel of uclibc-ng. - # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. - # If we really want the ABI bump, we'll have to hack the gcc - # spec file and change the '*link:' rule. - version_0=$(ver_cut 1) - version_1=$(ver_cut 2) - version_2=$(ver_cut 3) - if [[ -z ${version_1} ]]; then - subversion=0 - extraversion=0 - else - subversion=${version_1} - if [[ -z ${version_2} ]]; then - extraversion=0 - else - extraversion=.${version_2} - fi - fi - - sed -i \ - -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ - -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \ - -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ - -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ - Rules.mak || die - - eapply_user -} - -src_configure() { - # Map our toolchain arch name to the name expected by uClibc-ng. - local target=$(tc-arch) - case ${target} in - amd64) target="x86_64";; - arm) target="arm";; - mips) target="mips";; - ppc) target="powerpc";; - x86) target="i386";; - esac - - # Do arch specific configuration by changing the defaults in - # extra/Configs/Config.. If these are not overridden - # by an save .config, they will be selected by default. - - # For i386, i486, i586 and i686 - local cpu - if [[ ${target} == "i386" ]]; then - [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86" - sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \ - extra/Configs/Config.i386 || die - fi - - # For arm - if [[ ${target} == "arm" ]]; then - sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm - fi - - # We set HOSTCC to the proper tuple rather than just 'gcc' - sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak - - make_config ${target} - - einfo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "ABI: ${ABI}" - einfo "ENDIAN: $(uclibc_endian)" - einfo -} - -src_compile() { - emake headers - just_headers && return 0 - - emake - if is_crosscompile ; then - emake -C utils hostutils - else - emake utils - fi -} - -src_test() { - is_crosscompile && return 0 - - # assert test fails on pax/grsec enabled kernels - # normal vfork test fails in sandbox (both glibc/uclibc) - emake UCLIBC_ONLY=1 check -} - -src_install() { - local sysroot=${D} - is_crosscompile && sysroot+="/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig - newbin utils/ldd.host ${CTARGET}-ldd - fi - return 0 - fi - - if use symlink-compat; then - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0 - fi - - emake DESTDIR="${D}" install_utils - dobin extra/scripts/getent - dodoc README docs/*.txt -} - -pkg_postinst() { - is_crosscompile && return 0 - - if [ ! -e "${ROOT}"/etc/TZ ] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - [ "${ROOT}" != "/" ] && return 0 - # update cache before reloading init - ldconfig -} diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest index f4f866a3bb84..4d4cb0a359ac 100644 --- a/sys-libs/zlib-ng/Manifest +++ b/sys-libs/zlib-ng/Manifest @@ -1,3 +1,5 @@ DIST zlib-ng-2.0.5.tar.gz 810110 BLAKE2B 70a7a4a4f5bcc792fcf5f41487160aa15481bc5512ddd567f59ac96ebd1b8ff7c1edb7e5887f16ee502a75fabb36caf88f0d88563a0d860679b0bfd0e0b9f12a SHA512 a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654 +DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B 52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9 SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 EBUILD zlib-ng-2.0.5.ebuild 1971 BLAKE2B 6c6f5f9b1af80c9a7dfa525c849990a590d140c382ee99a9c7965426f4974e34bffc6a18e6b047b336b5d41bf3939e4e6a039f29837ea6add42f0b9dac64b68e SHA512 6305b130787419a29e6c70a7af35e24ed04fb2365898e6a38c46894f6e2660686805d381f30dda00377db30c2088010c1308a9aa3665f678cb518dc4b5f0928b +EBUILD zlib-ng-2.0.6.ebuild 1971 BLAKE2B c165390bac57c8a5627f24b7bfa169ed6f5ae3f3a77b66796f74627640ac9f739cf1db4a7ba74568fe87d393d2eea8522e0aa4cd88831ed997868736026ce212 SHA512 1237b6fb1f97f421214ab10fd16c8ce961935b3bca20370e82491f4c681c1a5a72d68953a705ac82c11e4b4eadf703145b0b6577cd7cd9bbd641fa33b857b72a MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild new file mode 100644 index 000000000000..5abbd8a2ea61 --- /dev/null +++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Fork of the zlib data compression library" +HOMEPAGE="https://github.com/zlib-ng/zlib-ng" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +#KEYWORDS="~amd64 ~x86" + +CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} ) +IUSE="compat ${CPU_USE[@]} test" + +RESTRICT="!test? ( test )" + +RDEPEND="compat? ( !sys-libs/zlib )" + +src_configure() { + local mycmakeargs=( + -DZLIB_COMPAT="$(usex compat)" + -DZLIB_ENABLE_TESTS="$(usex test)" + # Unaligned access is controversial and undefined behaviour + # Let's keep it off for now + # https://github.com/gentoo/gentoo/pull/17167 + -DWITH_UNALIGNED="OFF" + ) + + # The intrinsics options are all defined conditionally, so we need + # to enable them on/off per-arch here for now. + if use amd64 || use x86 ; then + mycmakeargs+=( + -DWITH_AVX2=$(usex cpu_flags_x86_avx2) + -DWITH_SSE2=$(usex cpu_flags_x86_sse2) + -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3) + -DWITH_SSE4=$(usex cpu_flags_x86_sse4a) + -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul) + ) + fi + + if use arm || use arm64 ; then + mycmakeargs+=( + -DWITH_ACLE=$(usex cpu_flags_arm_crc32) + -DWITH_NEON=$(usex cpu_flags_arm_neon) + ) + fi + + if use ppc || use ppc64 ; then + # The POWER8 support is VSX which was introduced + # VSX2 was introduced with POWER8, so use that as a proxy for it + mycmakeargs+=( + -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2) + ) + fi + + # TODO: There's no s390x USE_EXPAND yet + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use compat ; then + ewarn "zlib-ng is experimental and replacing the system zlib is dangerous" + ewarn "Please be careful!" + ewarn + ewarn "The following link explains the guarantees (and what is NOT guaranteed):" + ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md" + fi +} -- cgit v1.2.3