commit: 0dd7183dd91b537ce4fb997153ce574f1b8fa482 Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com> AuthorDate: Wed Nov 1 00:16:32 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Nov 2 01:19:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0dd7183d
add sys-fs/udisks sys-fs/udisks/Manifest | 3 ++- sys-fs/udisks/files/udisks-musl-nonglibc.patch | 26 ++++++++++++++++++++++++++ sys-fs/udisks/udisks-2.1.6.ebuild | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 981f51b..a9ce2ae 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,5 +1,6 @@ AUX udisks-2.1.6-musl-fixup.patch 1114 SHA256 aa1e5f0f798806e3136940cb8f11cddfb00c9891606e75a1fe9520a993be889b SHA512 224682d21c1885911738a4f200b1c7e597143ca2fa60999f48c786eb4390e1652048d9f996973f72dd72c3837f9930abe4ae82e52baefd96b0d7100fba9b7750 WHIRLPOOL 805a317ceaf02e85dfc998404760606d8923a1c7a604023a78dfaba3f848ac7d3e6003d14938e816c5b87be0ecbc085401bd040b7cee3c76d8aba6eaf447f93a AUX udisks-2.1.6-musl-fixup1.patch 223 SHA256 97a86c44ac43c12de4080e3c47dc597f9aff61470dea42dea80baebc6724e6b6 SHA512 b7b515e70e5f3770133de934875d039810a8232d1212279902016ee77ad03837f50a98a588ec53ed1907ff3689dd92b0a4c0f0c7d1b772a1766d2b255c101aa8 WHIRLPOOL 681bea6bdae4f59ff350669859a78c40bc65d92b30fc3e2eeb4de2af299db42dc370320de29e64679e775cd8d18d650f75447bf2b0998de377f265c0aa10c9c5 +AUX udisks-musl-nonglibc.patch 731 SHA256 8860e19d783a582d5a44cee68b93c9128a6b1de8d1322fa2ed51aa4a4d308739 SHA512 b47c4931237b47f78b7265dcf4ee431e9288ac9d8af08cfa5f4a46357b4abd02db10fe30d689bc44a8e45b1ec9dfa2038ca8be5e49ebc9c4d4092f7e20de6452 WHIRLPOOL 81a83431d5aac8d30c88e69671d3f37823645665e837df13e667f6fea96eb1a4774dff7e6118e182ab5ee36e4005479c1e62b90451e595c3fd3db2b214a0689e DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797 -EBUILD udisks-2.1.6.ebuild 3003 SHA256 b2a188719b50ae2e1ca484c999286e0c4fffa37e8343473ef11c3030cb4cb67f SHA512 41fe3fc209b695364130ce3fadd24a4e304be69ab36512480e081fdec5c2c42aa3baab41b48bd0a80220f4a4aad806afe8c38d757267f181381a23d916d729aa WHIRLPOOL db7e244c46d0c90620ceddaa522119b59616a756b633dfb986540be95af060308ee201295a0a34820a47d7a50a6c9698f97211cb865e9f58de7066012e4ed72e +EBUILD udisks-2.1.6.ebuild 3051 SHA256 4b58fa36b29dab858adc0dc679c34bd18a590c4327c8f5972a53baa90d752ac6 SHA512 a4af2d29fc4b8e8f0d308cb903a3c8bf68aed5c120fd17d615f8c2f1255056deaad304cbc7ca4c3cc8e3d2f520352dff4bd868eff12967c90eaae5cf2f2c0a75 WHIRLPOOL d0c10ee2456627c62e2f8e3936b3b2ba0969fc98a1e0e82c0e1906dd48747c1fc1489789df308bc0f492e5e1b0afc21431f9f0fede58ced2408b5e7fef1566b2 MISC metadata.xml 620 SHA256 d11881e74cd73ce82d1a7bbb7173b704ba9896307cd1f002335c64b18422ede4 SHA512 ee79cea4796a96ff4da6d28071b166f4c8fb7f023e5a924a821daa488fdc4315a7f8792f3eadb94afc0417529ab9567ba3d260aaed03c039466341d0a5b15136 WHIRLPOOL 8d09b15e998c04146d74daee98f0acf95f57b8365c846dbd51395d5c1e4d426f758aec49cf844b841526ba4c83d51f883e2d3f6b7ca306c6f9bd37323757fafc diff --git a/sys-fs/udisks/files/udisks-musl-nonglibc.patch b/sys-fs/udisks/files/udisks-musl-nonglibc.patch new file mode 100644 index 0000000..98e6c75 --- /dev/null +++ b/sys-fs/udisks/files/udisks-musl-nonglibc.patch @@ -0,0 +1,26 @@ +musl does not define __GNUC_PREREQ therefore check for C library being glibc +if not then define the macro + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +Index: udisks-2.1.7/udisks/udisksclient.c +=================================================================== +--- udisks-2.1.7.orig/udisks/udisksclient.c ++++ udisks-2.1.7/udisks/udisksclient.c +@@ -27,8 +27,15 @@ + #include "udisksobjectinfo.h" + + /* For __GNUC_PREREQ usage below */ +-#ifdef __GNUC__ ++#ifdef __GLIBC__ + # include <features.h> ++#else ++#if defined(__GNUC__) ++#define __GNUC_PREREQ(__maj, __min) \ ++ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) ++#else ++#define __GNUC_PREREQ(__maj, __min) 0 ++#endif + #endif + + /** diff --git a/sys-fs/udisks/udisks-2.1.6.ebuild b/sys-fs/udisks/udisks-2.1.6.ebuild index 7aafc4d..d92a3ee 100644 --- a/sys-fs/udisks/udisks-2.1.6.ebuild +++ b/sys-fs/udisks/udisks-2.1.6.ebuild @@ -67,6 +67,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup.patch epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup1.patch + epatch "${FILESDIR}"/${PN}-musl-nonglibc.patch epatch_user }
