diff options
Diffstat (limited to 'dev-lang/icon')
| -rw-r--r-- | dev-lang/icon/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/icon/files/icon-9.5.1-musl.patch | 24 | ||||
| -rw-r--r-- | dev-lang/icon/icon-9.5.1-r2.ebuild | 18 |
3 files changed, 41 insertions, 4 deletions
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index e2001f439434..815c674ae932 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,6 +1,7 @@ AUX icon-9.5.1-flags.patch 2148 BLAKE2B 37fcaca92f67be74caddbf7789ca4e666a4e0b98e7cac3a89376bae5c50fd248eae0f0b282a46ec8d6dc55f5c423ad6dc69744d2999e96ec183d9bb369f7e7b0 SHA512 28b201a1347167b028187d6d35cb50450cf6a13b48fbf65a616683fb6c5d3373d9ba9e64c3d6fe397e858388c88a52ab330a00dc5e4ca087567089e8cdd3c897 AUX icon-9.5.1-fpoll.patch 977 BLAKE2B 720fac1a8109d3400b6a718f708904d14e2d4207840a2e4d31888dd4be2d02c241c2f40271b89f6e3273732288e203e9298f061dfb485ca4eb0c24baea02534c SHA512 4b9d471d7d2992a75cccea98790339318b8a622d993a34affc69e0dbbbfa7103e8b994494eb33aaf26168bdb18623c5419f2c34471dee4adb1a004b420b793ab +AUX icon-9.5.1-musl.patch 726 BLAKE2B 83aff0d45e50afa88830d18dbec53838e8adaaa4099fbe405b2212fbc0e53240fc0b21d934f2dfc263afc576bf671924d253784dc65e498b4bacecc91d479255 SHA512 b2be4642126edd75f6ae3466879841ec0123c367c93d74d91d9b9f290deaef9d7bbaa6642ad0440e297850664c6da7f33931782214c9afd8ca2d380b75d588e1 DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad EBUILD icon-9.5.1-r1.ebuild 2518 BLAKE2B d305f28d494f0924035e7b4a6f5d8165741b8b4b782f0aa3133cca9503656c72172a63f8db31e080d238eb527300258654f43a3dfcef9e085b949d7bcb172252 SHA512 49c548061175a7999717b184b4dbfc69ccf9a316a13d8784a586dca68108c324eaf08ca4b9b488445f7fe5fd77d878648d580570b9c30b4163a1c2249f1da3bc -EBUILD icon-9.5.1-r2.ebuild 2677 BLAKE2B 0e4c2c69d4129cca02150a4b99b19e39fafdf70e0cd69399f4799be449498ab9af1fa5e2fff29e15a684aee0ad881e55bb7f81c1157f64af29452013584b8255 SHA512 b60f02abf351ddb63afb4852189983efc46b0888bdaaf20c500a9203e0d11345d07274a22b2c0691b5a87c6c5913efeea7e9f696ce2e868fbd9580929d0fa04e +EBUILD icon-9.5.1-r2.ebuild 2982 BLAKE2B 30b2887bf207653d25f1e0903e7731b9ea9293c471496aef642b0947320765df736067cab39c66285b286ec9d0c588c8a4613bc04371e1bd8a924996bf70b88c SHA512 3936d1b2479c2a31a1229fdf7f2b5e1d7d18ae3974ae06109d2f4aea341cb2aaede33cbea8c98ee48a7ac00dddba84340b08af79174166dd7a682fa65a9cf055 MISC metadata.xml 467 BLAKE2B b480285505dec662f62038d22a88323f01f21b100de7ee652f2e3d5f5f4cdf4345ad7d303f2713b1a2816157c46610c2f5287cb385c61998f68fd95d09bf9d5b SHA512 1a77000b72ae453ecb2bd4452e32ea917328a61bb882e107b96f013ddaa218e951743569e38e97210a341755bd7c891324123d96e56da9a5a7caa93ad4dbb93a diff --git a/dev-lang/icon/files/icon-9.5.1-musl.patch b/dev-lang/icon/files/icon-9.5.1-musl.patch new file mode 100644 index 000000000000..16fc9df01738 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.1-musl.patch @@ -0,0 +1,24 @@ +diff -uprN a/ipl/cfuncs/fpoll.c b/ipl/cfuncs/fpoll.c +--- a/ipl/cfuncs/fpoll.c 2020-05-10 21:46:39.730752626 -0600 ++++ b/ipl/cfuncs/fpoll.c 2020-05-10 21:50:41.613577816 -0600 +@@ -33,6 +33,10 @@ + #include <sys/types.h> + #include <sys/time.h> + ++#if defined(_MUSL) ++# include <stdio_ext.h> ++#endif ++ + #include "icall.h" + + int fpoll(int argc, descriptor *argv) /*: await data from file */ +@@ -66,6 +70,9 @@ int fpoll(int argc, descriptor *argv) /* + #elif defined(_FSTDIO) /* new BSD library */ + if (f->_r > 0) + RetArg(1); ++#elif defined(_MUSL) /* MUSL library */ ++ if (__freadahead(f)) ++ RetArg(1); + #else /* old AT&T library */ + if (f->_cnt > 0) + RetArg(1); diff --git a/dev-lang/icon/icon-9.5.1-r2.ebuild b/dev-lang/icon/icon-9.5.1-r2.ebuild index 5f313ed60aae..d986c29147b0 100644 --- a/dev-lang/icon/icon-9.5.1-r2.ebuild +++ b/dev-lang/icon/icon-9.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,8 +31,13 @@ PATCHES=( "${FILESDIR}"/${PN}-9.5.1-flags.patch # https://bugs.gentoo.org/669330 # Fix glibc 2.28 problem. - # Patch has also been submitted for upstream approval + # Patch has been accepted upstream, but is not yet in a release "${FILESDIR}"/${PN}-9.5.1-fpoll.patch + + # https://bugs.gentoo.org/716212 + # Fix building with musl + # Patch has been accepted upstream, but is not yet in a release + "${FILESDIR}"/${PN}-9.5.1-musl.patch ) src_prepare() { @@ -61,8 +66,13 @@ src_configure() { -e 's:-L/usr/X11R6/lib64::g' \ -e 's:-L/usr/X11R6/lib::g' \ -e 's:-I/usr/X11R6/include::g' \ + -e 's:-I/usr/X11R6/include::g' \ + -e '/^CFLAGS/d' \ Makedefs || die "sed of Makedefs failed" + if use elibc_musl; then + append-flags "-D_MUSL" + fi append-flags $(test-flags -fno-strict-aliasing -fwrapv) } @@ -85,7 +95,9 @@ src_install() { dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx dosym ../$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib + if use X; then + dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib + fi cd "${S}/man/man1" || die doman "${PN}"t.1 |