diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-19 12:34:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-19 12:34:34 +0000 |
| commit | 1d300fd75dc60cab2ca6e0bb0016b09a4fb7c67a (patch) | |
| tree | 5dff362f093f67da764ce10a380ad9d14646b46e /dev-libs/aml | |
| parent | 78634f348a30a55cc55606ee1ecde032241ceaeb (diff) | |
gentoo auto-resync : 19:03:2023 - 12:34:33
Diffstat (limited to 'dev-libs/aml')
| -rw-r--r-- | dev-libs/aml/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/aml/aml-0.3.0.ebuild (renamed from dev-libs/aml/aml-0.2.2.ebuild) | 10 | ||||
| -rw-r--r-- | dev-libs/aml/aml-9999.ebuild | 14 | ||||
| -rw-r--r-- | dev-libs/aml/files/aml-0.3.0-queue.patch | 21 |
4 files changed, 41 insertions, 11 deletions
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest index 33cebcbc56ca..c905fc11481d 100644 --- a/dev-libs/aml/Manifest +++ b/dev-libs/aml/Manifest @@ -1,4 +1,5 @@ -DIST aml-0.2.2.tar.gz 20442 BLAKE2B 3ea4e03ba511096fc02db628d2591ddf247f79ccdf7638614a2a20fe74dfa563b555662492d976371b407ab013bbb83c193c047fca48f7f08b05cf47e6a87ab4 SHA512 3cb5bf28186a9056b579dd76440202837d96a7abde9427c45a810068d5e051c642303cd73b012e3b093ffb1577896753a50fcc508b2a30c49146033bb74156e7 -EBUILD aml-0.2.2.ebuild 811 BLAKE2B 2c9b005eccfdfa1484c8996c5ba75252264aa3d6785df97b407af3b034ec5c5abe28979ce8b8ea82b3ae68cccd7282b4b7336e297bc3e19ee0de56dd7aba7fb1 SHA512 3db5040eb9830083e42b0e799b137954aa974db9a5007b0e7b2e016659112f0215755d4abd876d4415f3f8e849370a52ed693c9dad70a80047bc5c1f9177c0b0 -EBUILD aml-9999.ebuild 788 BLAKE2B ee37f57ecb8bb8102a47c850411ad4f6fa6704578d195d6c11a9439e1f7e7f6348ebaec149aff998ab852f6a1a6fdee21d3d625cbf78ef3dff7ac31e72b12169 SHA512 776d53c5e77998003794703e9b00d99eb5d3c8e05adc285322c944c509752313f8c825bcef2b28ce8f2442e52b558c9f77dd799bd136b37d7c9016cc7ed5f755 +AUX aml-0.3.0-queue.patch 713 BLAKE2B 14ff2d9c03cd5e889bb78a9786fd7bcbdce2a467438867c976a73d18e6ebb7b55733c0dd5c3ba88f55b4fac62d1b48c48a367998142d920261632d5f11fe37c7 SHA512 6e01287997d9393fd3418354c48cc4c41ce24fc3781cf5c5ee5f968197e36a0ab342056fea8f011f790b82fe6e13a9785371251971fbdd66fe347850a824bb21 +DIST aml-0.3.0.tar.gz 21070 BLAKE2B 09b8818ba63eb0f8c36e90385ee0787cad45b80c71cfcf439f93560f56269d52468bbdd2c0e8ad6cbf78b8fd0dd715aa107bfeb3918f55671ffca3f8daab56e3 SHA512 7c3347ef47ace8a14860e2b46937c8ade3712aa75a8c36845594fb4fa6ca26c35320b5234574accff451ea8302f23075acbe1a1b0392f5fbcbbbda20640be1fd +EBUILD aml-0.3.0.ebuild 903 BLAKE2B 7f432bd4e55cba2520043f4f1dfaa32a12fa116c209aad962d7ce5fab46b1dd1adc0e6b0ce88b8f2f548896b6e74bb02866c363011882916405851ba7ad6876a SHA512 a07b8bfd5000e15a5d443fc2b14661c51e1e9f12ddd3863651d995289aaa6294950507380e2f5554c57f929d351fdc312800e3ef660ca2f2aacc3aff99553e17 +EBUILD aml-9999.ebuild 903 BLAKE2B 7f432bd4e55cba2520043f4f1dfaa32a12fa116c209aad962d7ce5fab46b1dd1adc0e6b0ce88b8f2f548896b6e74bb02866c363011882916405851ba7ad6876a SHA512 a07b8bfd5000e15a5d443fc2b14661c51e1e9f12ddd3863651d995289aaa6294950507380e2f5554c57f929d351fdc312800e3ef660ca2f2aacc3aff99553e17 MISC metadata.xml 314 BLAKE2B fc1e90acf2fa500b8297519bd2dc8564d1f9e16dec689c0dcc93afa22178e4d1b9ddfc4443a02b7135aa6a4a8454fc58b829f8b232b23271be73ace58d7aa268 SHA512 f8a38eface650ff709222d3c1ff19516cdbb94c70b1e2b826bd1df5a02a40ecbc1c921e8649cd71ae55902beb52d21eab609b0263e63e2328fb12923cf4b699f diff --git a/dev-libs/aml/aml-0.2.2.ebuild b/dev-libs/aml/aml-0.3.0.ebuild index f455ef42c8e7..a7c7dfbf2a1a 100644 --- a/dev-libs/aml/aml-0.2.2.ebuild +++ b/dev-libs/aml/aml-0.3.0.ebuild @@ -22,12 +22,16 @@ IUSE="examples" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" +PATCHES=( + "${FILESDIR}"/${P}-queue.patch +) + src_prepare() { default - # The bundled copy includes cdefs which breaks on musl and - # this header is already available on glibc. - # bug #828806 + # The bundled copy includes cdefs which breaks on musl and this header is + # already available on glibc. See bug #828806 and + # https://github.com/any1/aml/issues/11. rm include/sys/queue.h || die } diff --git a/dev-libs/aml/aml-9999.ebuild b/dev-libs/aml/aml-9999.ebuild index abe16736f7e8..a7c7dfbf2a1a 100644 --- a/dev-libs/aml/aml-9999.ebuild +++ b/dev-libs/aml/aml-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/any1/aml.git" else SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~loong ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86" fi LICENSE="ISC" @@ -22,12 +22,16 @@ IUSE="examples" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" +PATCHES=( + "${FILESDIR}"/${P}-queue.patch +) + src_prepare() { default - # The bundled copy includes cdefs which breaks on musl and - # this header is already available on glibc. - # bug #828806 + # The bundled copy includes cdefs which breaks on musl and this header is + # already available on glibc. See bug #828806 and + # https://github.com/any1/aml/issues/11. rm include/sys/queue.h || die } diff --git a/dev-libs/aml/files/aml-0.3.0-queue.patch b/dev-libs/aml/files/aml-0.3.0-queue.patch new file mode 100644 index 000000000000..299379a934f6 --- /dev/null +++ b/dev-libs/aml/files/aml-0.3.0-queue.patch @@ -0,0 +1,21 @@ +The bundled queue.h breaks on musl, but the standard version lacks +LIST_FOREACH_SAFE, which appears to come from FreeBSD, so patch that back +in here. See https://github.com/any1/aml/issues/11. + +diff -Naur a/src/aml.c b/src/aml.c +--- a/src/aml.c 2023-01-22 12:57:53.000000000 +0000 ++++ b/src/aml.c 2023-03-19 10:10:11.034092428 +0000 +@@ -31,6 +31,13 @@ + #include "sys/queue.h" + #include "thread-pool.h" + ++#ifndef LIST_FOREACH_SAFE ++#define LIST_FOREACH_SAFE(var, head, field, tvar) \ ++ for ((var) = LIST_FIRST((head)); \ ++ (var) && ((tvar) = LIST_NEXT((var), field), 1); \ ++ (var) = (tvar)) ++#endif ++ + #define EXPORT __attribute__((visibility("default"))) + + #define EVENT_MASK_DEFAULT AML_EVENT_READ |