diff options
Diffstat (limited to 'sys-libs')
23 files changed, 350 insertions, 268 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex 30e58f0b5b8b..4bc9d5b65263 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 1e315bfcda38..dd682938b9f4 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -48,7 +48,7 @@ EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa09 EBUILD glibc-2.23-r4.ebuild 4975 BLAKE2B 9a0d3a3689896fab9f71fa20a83be5f2563f023040563f85385f8d28d32d6eee7f144acbdf4a35d6c1a65d56289ae72813b1d7f561f514e391e95dd4e43a4902 SHA512 9662308abee890c1eeaa45a49c4238448c62400d8b8661fc7588cd78aa58cbe044a0c15f46a6e8d161a203f3645600385fc2200d4d6434c24e496781aa06b04a EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9 EBUILD glibc-2.25-r10.ebuild 5002 BLAKE2B c02b66123475631ccd8cde92dc533c1057b1c1308f797948db8caad0cdec2a83a5ff241bc6d1b2e845f46f28bd8b874cd0cf1f761e3181c7a3b1129e1fd99611 SHA512 5342f2d433ae255670732d8f2e6cd21d648b6fe93500cc3697f31aac06ef7e252769608e1c17d5407e075c78602124a8f62ee59ef2048499beb821c76f7871b6 -EBUILD glibc-2.25-r11.ebuild 5002 BLAKE2B 69bb6f390614f5a5bd66ebc75944f912cb19799648c6e2153a1ada9ec3e71303b247b65a3a96e5b636b70c687fc8b8fe1206b9a46ec4695e6ca667edf959339a SHA512 10ebc515e3b8c515f5f2114535bdb4c1f0f4cd6d74fe71bc8cb64ccf8bfdaad7006c20ea54e85dac6e6cbc7b4e703d265dee51769bad767a3641a775b3836af2 +EBUILD glibc-2.25-r11.ebuild 5001 BLAKE2B 30988b55a9f655033db8cb2ac3c6ae0183c8a240134bcf26b9b98503a2351bf30fb3742cf84c23b4c81d56797b0c83d138341d6335659046784208a6404776f8 SHA512 43118e02defd07a02b3a9bd8220ed0dcfb7fb0b2c4bcf3b6d510a78a978295814e44ae329fa4a41ef99a73c10d8fbf9a31f84a53a9196bc848af28f3a33720d3 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260 EBUILD glibc-2.26-r6.ebuild 25614 BLAKE2B 32bd3f11186c7f5619a7c83358cd5e416bc9c4ff6f6355ab9f65d68e94fefad99557bc993033a711fbea3f402c898ddcd494ecbc3c10f5e0c8dacdfce632b8e0 SHA512 256bbd3e1a5c4aaee844e4da88a0851608ec75fe7d1d10486849be57d14a202e4d10904873cdae565ae9ac216607072f765d18967007a0d16ea5f2103a76b20c diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild index 4595e6f13064..6e74ceffe238 100644 --- a/sys-libs/glibc/glibc-2.25-r11.ebuild +++ b/sys-libs/glibc/glibc-2.25-r11.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 3d54c12b4f74..4e40cf38b15f 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,11 +1,7 @@ AUX 4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch 3456 BLAKE2B f8a1de1e63d80f8617c64a52caaae0730e11ba3559dd0cefcd12105be366c88f68c1076f78d2af0c5962eff30de0e9be8115be2c6fc29e7ed98de5176c82c777 SHA512 677d6d7e316d6df028ebed606cde1a4225ed6e06bacbe81cd527acf57c705858ab5aed2f71946c2404336033bfa985dafee2d56423204a59954a80424ca856e0 -AUX libomp-3.9.0-musl-strerror_r.patch 1159 BLAKE2B e46c4b337f1203727bf0da344b06b07fb658d2e1a97e422120c10ed363f5823bebfd3dd74996dd53bb02349ecb307225dc9982fb63e7ddb002b492ca96583cd5 SHA512 f35c5b9b1acf3cc636b505b8935a974796080fa71d96aee46e4edb559a5c5c03bf95457b27e1f026b4330a052654de539d556c4098f1b4a02cd2f95740bc3a4f -AUX libomp-3.9.0-optional-aliases.patch 2536 BLAKE2B 1b09582647ff0c955603485d014b755f11f3ed9b0c0f4a0959d0a4070f9ed848f859ff56a7387ad5e817a536efef4ad721c0a66b2801cdae6079079559e7cf4c SHA512 0cf501decca0997ee84754bc6c5b3401dbf408571dc169bbfd3fe892f6d0c730785a1bb4293e55eb47f8e808707810e22fac15702853a06cd7531d7a37c54265 -DIST openmp-3.9.1.src.tar.xz 2031588 BLAKE2B feafb94a832ec48a67d6e00720724dcecb533a4a09e0d69462af33e13454b20393aa21fabb062c362824cdfbee712db1030732271e4cd49085fa69cff9800835 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf DIST openmp-5.0.1.src.tar.xz 2075472 BLAKE2B a4da4726a17dc0fd083e11fe1bebf446978137aa4453000e8fea950021fff091a818246f0817dd60ce67353d3f7d75ab8fec2b9e955389d9c94e195945efda50 SHA512 4493b918fd83ef26e2b3f3429d1b00d722328e4c9697ac7625a390834f6e88ada8e5b02ce0ecb4771129207b1b81a9d171f4599ab9388762a3c6db0afc499ff4 DIST openmp-6.0.0.src.tar.xz 2272360 BLAKE2B 2fbbdbbd0262ac3161446a4e7a3079131254f962a5397a94913abff024ba3f66affe419c58fb0f6ab602e338a277ab2befbc4386eaf6d4c11aa4a9713315d562 SHA512 9dfb070a3fae883985e3c8cd357c21a2144b433824139e288d4d3c774dd9cf3f7949978976012b08c644cd4a04be8c65a810c2f33d66eee05d3d980e61413a06 -EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1ce0abb127d68bbe09f4e735d6d8ed4404f19bb6d8cb4808a782a5b72c9425e4acd2fe2cc97ebc3372de1c72c SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794 EBUILD libomp-4.0.1.ebuild 2527 BLAKE2B be262aa449e8d3c2392793b8af597c7d9a02e624f0d57ad8b24ef822bd57f6d243200ccee1022c18dcc52fc2d198d6aa2cfe83a1224f614ce0b2305f3f6bff69 SHA512 ca34a666e1aa6e767cd979866bcdcaf55da75dc8faa80d062e718ceda56576c3ebec88972787ae5dc4532bfdeb2d7f34f233b8c4983bfb1bc89bbd443ac54ac7 EBUILD libomp-5.0.1.ebuild 2385 BLAKE2B e887b48183a5e2d8f4f5476579ec88f99d0b709ea4136914978014e51b8d63451d62c5216690b908d7e853141266831a560a1802945d88fe5940d30100b6cbdd SHA512 a36ce91d70d506f9baa07f2aca394325e382b794e0797ecdb308eb98fab38079ec8b5ca10d1c7368ec06275b76c1487f581a4196f0499645edab4b34e974a594 EBUILD libomp-6.0.0.ebuild 3253 BLAKE2B f7af36085e4b0fec9d3efe29fce1f7374b239c8265883488601d227cc1ec120f47a7634f7caad025148755775e41b48af062ad7a45ee693f7bbea4ce65a3ac05 SHA512 b059a151907c2ceef9452446fe9aa18655ba4d160995ea6f867b08c70abaea557096df808cec8a9e0d9ec3be3d3fcbcaea210488b630391b86b75ca8790d36a4 diff --git a/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch b/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch deleted file mode 100644 index 4fbf9f691c05..000000000000 --- a/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4fa7d5e207a4f7ef79b423b7d9658b7625795f5c Mon Sep 17 00:00:00 2001 -From: Michal Gorny <mgorny@gentoo.org> -Date: Tue, 18 Oct 2016 16:38:44 +0000 -Subject: [PATCH] Fix a compile error on musl-libc due to strerror_r() - prototype - -Function strerror_r() has different signatures in different -implementations of libc: glibc's version returns a char*, while BSDs -and musl return a int. libomp unconditionally assumes glibc on Linux -and thus fails to compile against musl-libc. This patch addresses this -issue. - -Differential Revision: https://reviews.llvm.org/D25071 - -git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@284492 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - runtime/src/kmp_i18n.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/src/kmp_i18n.c b/runtime/src/kmp_i18n.c -index 546e693..e008d1f 100644 ---- a/runtime/src/kmp_i18n.c -+++ b/runtime/src/kmp_i18n.c -@@ -809,7 +809,7 @@ sys_error( - int strerror_r( int, char *, size_t ); // XSI version - */ - -- #if KMP_OS_LINUX -+ #if defined(__GLIBC__) && defined(_GNU_SOURCE) - - // GNU version of strerror_r. - --- -2.10.1 - diff --git a/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch b/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch deleted file mode 100644 index faf5bb51bca9..000000000000 --- a/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 89ab78e360b7b20ebe1bc89736880a8e4aaa9e6e Mon Sep 17 00:00:00 2001 -From: Michal Gorny <mgorny@gentoo.org> -Date: Wed, 14 Sep 2016 17:46:27 +0000 -Subject: [PATCH] [cmake] Make libgomp & libiomp5 alias install optional - -Introduce a new LIBOMP_INSTALL_VARIABLES cache variable that can be used -to disable creating libgomp and libiomp5 aliases on 'make install'. -Those aliases are undesired e.g. on Gentoo systems where libomp is used -purely by clang. - -Differential Revision: https://reviews.llvm.org/D24563 - -git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@281512 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - runtime/CMakeLists.txt | 4 ++++ - runtime/src/CMakeLists.txt | 16 +++++++++------- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt -index 9db058b..e8e9a74 100644 ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -340,6 +340,10 @@ endif() - - set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX}) - -+# Optional backwards compatibility aliases. -+set(LIBOMP_INSTALL_ALIASES TRUE CACHE BOOL -+ "Install libgomp and libiomp5 library aliases for backwards compatibility") -+ - # Print configuration after all variables are set. - if(${LIBOMP_STANDALONE_BUILD}) - libomp_say("Operating System -- ${CMAKE_SYSTEM_NAME}") -diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index 777434d..c80f88d 100644 ---- a/runtime/src/CMakeLists.txt -+++ b/runtime/src/CMakeLists.txt -@@ -305,13 +305,15 @@ else() - - install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION lib${LIBOMP_LIBDIR_SUFFIX}) - -- # Create aliases (symlinks) of the library for backwards compatibility -- set(LIBOMP_ALIASES "libgomp;libiomp5") -- foreach(alias IN LISTS LIBOMP_ALIASES) -- install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\" -- \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY -- \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})") -- endforeach() -+ if(${LIBOMP_INSTALL_ALIASES}) -+ # Create aliases (symlinks) of the library for backwards compatibility -+ set(LIBOMP_ALIASES "libgomp;libiomp5") -+ foreach(alias IN LISTS LIBOMP_ALIASES) -+ install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\" -+ \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY -+ \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})") -+ endforeach() -+ endif() - endif() - install( - FILES --- -2.4.10 - diff --git a/sys-libs/libomp/libomp-3.9.1.ebuild b/sys-libs/libomp/libomp-3.9.1.ebuild deleted file mode 100644 index f52c0d168fd3..000000000000 --- a/sys-libs/libomp/libomp-3.9.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} - -inherit cmake-multilib - -MY_P=openmp-${PV} -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org" -SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz" - -# Additional licenses: -# - MIT-licensed Intel code, -# - LLVM Software Grant from Intel. - -LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant" -SLOT="0/3.9" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="hwloc ompt" - -RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}/${MY_P}.src" - -PATCHES=( - # backport of https://reviews.llvm.org/D24563 - "${FILESDIR}"/${PN}-3.9.0-optional-aliases.patch - # backport of https://reviews.llvm.org/D25071 - "${FILESDIR}"/${PN}-3.9.0-musl-strerror_r.patch -) - -multilib_src_configure() { - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" - -DLIBOMP_USE_HWLOC=$(usex hwloc) - -DLIBOMP_OMPT_SUPPORT=$(usex ompt) - # do not install libgomp.so & libiomp5.so aliases - -DLIBOMP_INSTALL_ALIASES=OFF - # disable unnecessary hack copying stuff back to srcdir - -DLIBOMP_COPY_EXPORTS=OFF - ) - cmake-utils_src_configure -} diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest index 9d49ef8636b2..08787db419fb 100644 --- a/sys-libs/libstatgrab/Manifest +++ b/sys-libs/libstatgrab/Manifest @@ -2,5 +2,5 @@ AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a DIST libstatgrab-0.17.tar.gz 463224 BLAKE2B fff9f0833a0320de469c81d1dd10a62f0a81413a243c38d449ea8129a4635f55056d431f2b585b5f77082829438c8945d961c4a6ca1db13e0b4c9689bfd47905 SHA512 feb8d8aa345d57a9036700d580a7d1e21aed9bb2063b46b2c57a59fce00eb20a22590e5e391c8a9a1f43055c14a6ce3fcf648b98f1fec3b4efd270455a2933e3 DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6 EBUILD libstatgrab-0.17.ebuild 776 BLAKE2B aecb835256c01a586d410dbbe8f117d390e698df823d7476c0415c9c2fc7373e675ec0e96be7191a91c08b112230cf29988d81c28bc79d1729c899d2a4bae6f4 SHA512 e13d4dc6f30aa1c354b9239b99d1d813b400930dfb7ec61ef51c3ef4697b46a3c1470460d1acceeb1dd97db62969396bf977facd1c1e3bbbab97f3b6f842834c -EBUILD libstatgrab-0.91.ebuild 1028 BLAKE2B da41c451c0acdab5edd0864f50c03aa5dd785ef1645aa0e3d3b845393795279e43fd9eb64feacc0386d89dea3cf5bd05ebf0beae6b700eac935fb6557dbd2966 SHA512 e818d915ba1ece7a4b5c2103367e9b3d5c1abe45f6872966d061e1c82f95a2aa5533ccdfd8fbdda89832e54a36137f94e0522280b60fb33484a3d1976df4336a +EBUILD libstatgrab-0.91.ebuild 1027 BLAKE2B 92c7dbf6c5c827ccf77cf2d724c38d081d90b3c321dcb6cd843a46ee323d2f40aaecbef20b70efbb7ce2a6ef2d49c1a05d9fa40595c0fa4895fa239c24dcb009 SHA512 54f7eb0951baa84255b34603f7f86a998b7c583c01e8395c9377ae1d1ac20dbdc38a0c6ae475d971c8bdf7f90483c88a10071724a788876fe3ef9af8d87e51ff MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild index cecf282cfc26..9bd210b59a20 100644 --- a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild +++ b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libsta LICENSE="|| ( GPL-2 LGPL-2.1 )" SLOT=0 -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc x86" IUSE="doc examples static-libs" RDEPEND="sys-libs/ncurses" diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 178c23508d01..6691ebdc8d1b 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -1,11 +1,8 @@ -AUX libunwind-3.9-cmake-static-lib.patch 1855 BLAKE2B 9ca4a2e8b8bdf3b9bcd8d2abda1ed1d5683f34b093347d01d383eb7f1ee65cf0100a740cde2511df3a81130c0b25604bf070f572c7c0629f6e81faf9263f45cb SHA512 1d0c5859394d027fd0b30ae30caa0aaee94e3880a16d1f46f318221f3062e126c25c6f20cdf087dc9b37d92517df499b0f79294a6e17c8ac5da694c0d825e9bc DIST libcxx-6.0.0.src.tar.xz 1549328 BLAKE2B 93adb339b0e849fca1850d379c8e74b407b0db8220f3a05f888db70d83ad07c3200dbd2a7827f92c60a2ba91d3395e4d1b4434ba70479c29a95aceda6c213e02 SHA512 3d93910f85a778f36c5f7a4429639008acba5713a2c8ac79a9de09463af6f9a388af45d39af23423a7223660701697ba067f3391f25d5a970973691dd88635e3 DIST libcxxabi-6.0.0.src.tar.xz 529212 BLAKE2B ae020e8831a6ae71d59d71e294bbb0aa6dbedf1b3036b2536d9456db8c51f21e57d082c5abf5e00921a14876328bdfafab3c04b4d761cb76d52e35ff97107510 SHA512 c5e4cc05105770b42b20595fdbda5e1483be4582bc94335da1a15531ba43a0ecf30e1e0a252f62d4d0e6c79cda9d44ff5fdbe69a0a295b2431fd6de158410e2e -DIST libunwind-3.9.1.src.tar.xz 61788 BLAKE2B bab410d714e2dc012273997bb3fb3c366f64608b712eae15f8c08a2b049b6bdba0660a1f4942906e2e9cd7b11563c8a5b3007b92b1485c32036ac84f55fe7053 SHA512 a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7 DIST libunwind-4.0.1.src.tar.xz 63388 BLAKE2B f49772beabaa8519a5f8dbbaef9c2d6554468a66b89a5f012946d59f772fe864809a5c95b726bcb4c059ca551a4eb023a88f4fa618756b34fef2058e272467e6 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59 DIST libunwind-5.0.1.src.tar.xz 72180 BLAKE2B da1fbb92e9953d018a3c30290ceda9a2a18c21b5c908d9ff65979158bd06b8866eb74f078d12832e2aed7d0332c996262e3b2a1341844eb933ba3de5fb41ff98 SHA512 6c0f7a286c1ffa46769685ee36604cd90ed40470e1c3d3ef03c46bcc9e5f9e36e68a0a1f67b9b300823170b48c9b8d2db4625afd885f1d024905db1dffd9fc49 DIST libunwind-6.0.0.src.tar.xz 76600 BLAKE2B 7767f3564ef72b6049c5247881e09e6c56ccd24acc1b7a1742476c4d01b2be792afdc73c8138ca5b1549be9b83267e6a7860aa085514d86eac90545219dae835 SHA512 a35e992223f094bdac5f1565806fe485a878f9baf4502e7f3777276f5c11aeff4beee155512b1c687f4471f34acbd50c834e98120093cf2582007422cec7fb2e -EBUILD llvm-libunwind-3.9.1.ebuild 1187 BLAKE2B adc3bdff94f0b5a855c4d6eac0ee123dbdc845da541d06fb6f3d533a0375d969427488cbbb4bcef4d545c8e6993ab4c78a8c5f3bca9f06f2b36a84199e471b0c SHA512 bdd65eb012df3af046c71406af02927255f3502aaf92e53fa9dbf2adfa0150b68e4325cfef2f07d1893738ba6ba3f009a89e37861ffe7999752ea77fc3963a0b EBUILD llvm-libunwind-4.0.1.ebuild 1094 BLAKE2B dec5d0847983833e461635ac5711b5d253963650aed87678277bec86d1334ae9348d26605e20acf2a8d2405e891dd10c9303abf7d243ed86e36c8f3e3f12b83b SHA512 3fb7283eea0b4282c549d7cf2cee1aea0f9d28b7689f5b83a32893c32ebfabc703eb0328593109db96a86351b639bc3e60572c7de93fbed18dd359a14b352386 EBUILD llvm-libunwind-5.0.1.ebuild 1094 BLAKE2B 3378498096da36b9cbd6e70c9f2646cf6215f6d964e0a991e389c33af1a1614bc0c0dd404b58141d64513a22709e1755c79f4466b3cf7b43515f623927f766f0 SHA512 cd9740fad0a59488d543fa2af2a2908457180840999d463071bb557d45214e0cf04069f922e90e0a3b3f8144b8966d2f3564c098561a2ae0511264d1eb2b104a EBUILD llvm-libunwind-6.0.0.ebuild 3744 BLAKE2B bd6b480a65c15c7d38043a4267bf1e02435a403a87b3280716e2de1e5dcf3bde6318bf7e361e309c3382b47a690b2a6fc42fd73c5c428ab0c70bbed62ad46ac6 SHA512 3095db45a2689d0a9fa6cc5550f5a897d2de00e3cbd07417e71e52dec301850d90a8e1f9dfd202c9f6485a9941d194704cf69825ff3e6252ebd73d32635c9a17 diff --git a/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch b/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch deleted file mode 100644 index 82beb4481410..000000000000 --- a/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 806b825..4b330f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,6 +104,7 @@ option(LIBUNWIND_ENABLE_ASSERTIONS "Enable assertions independent of build mode. - option(LIBUNWIND_ENABLE_PEDANTIC "Compile with pedantic enabled." ON) - option(LIBUNWIND_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF) - option(LIBUNWIND_ENABLE_SHARED "Build libunwind as a shared library." ON) -+option(LIBUNWIND_ENABLE_STATIC "Build libunwind as a static library." OFF) - option(LIBUNWIND_ENABLE_CROSS_UNWINDING "Enable cross-platform unwinding support." OFF) - option(LIBUNWIND_ENABLE_ARM_WMMX "Enable unwinding support for ARM WMMX registers." OFF) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b7c2d63..7c453de 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -51,8 +51,10 @@ set(LIBUNWIND_SOURCES - - if (LIBUNWIND_ENABLE_SHARED) - add_library(unwind SHARED ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS}) --else() -- add_library(unwind STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS}) -+endif() -+if (LIBUNWIND_ENABLE_STATIC) -+ add_library(unwind_static STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS}) -+ set_target_properties(unwind_static PROPERTIES OUTPUT_NAME unwind) - endif () - - # Generate library list. -@@ -109,7 +111,9 @@ set_property(SOURCE ${LIBUNWIND_CXX_SOURCES} - set_property(SOURCE ${LIBUNWIND_C_SOURCES} - APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_C_FLAGS} ${LIBUNWIND_C_FLAGS}") - --install(TARGETS unwind -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -- -+if (LIBUNWIND_ENABLE_SHARED) -+ install(TARGETS unwind LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+endif () -+if (LIBUNWIND_ENABLE_STATIC) -+ install(TARGETS unwind_static ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+endif () diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild deleted file mode 100644 index 6a132e567b55..000000000000 --- a/sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -inherit cmake-multilib - -MY_P="libunwind-${PV}" -DESCRIPTION="C++ runtime stack unwinder from LLVM" -HOMEPAGE="https://github.com/llvm-mirror/libunwind" -SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz" - -LICENSE="|| ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="debug +static-libs" - -RDEPEND="!sys-libs/libunwind" -# llvm-config and cmake files needed to get proper flags -# (3.9.0 needed because cmake file install path changed) -DEPEND=">=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]" - -S="${WORKDIR}/${MY_P}.src" - -src_prepare() { - # add switch for static-libs; accepted upstream - eapply "${FILESDIR}/libunwind-3.9-cmake-static-lib.patch" - default -} - -multilib_src_configure() { - local libdir=$(get_libdir) - - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install - - # install headers like sys-libs/libunwind - doheader "${S}"/include/*.h -} diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index b17ceef2a4ad..00366193d5c4 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -1,9 +1,10 @@ -AUX readline-5.0-no_rpath.patch 363 BLAKE2B fdb69d78351c67123fe48dfaff35f97878ec29a06a788a706c957ac0edd197acd1c96426f44885d8aebe7f5e7c1c91304fbd6d0606d21edefb59a1be05ffc8f1 SHA512 c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2 +AUX readline-5.0-no_rpath.patch 367 BLAKE2B a39663c6222f604acf0ea0a5b6e4a4c99097257727644d2e8b814377b0f9472a6cdba8ed6edacc61629a39458fb5905bb873474e72dd44ab3e7e78b330f451c5 SHA512 ce4a03fe5b60a1e785f35b6717c5e267a815e8fd1a1d59e527aa88f35709c457c1d7c505c34f63f0d32f8f1633eb66661e05e151e218ae5b74cec1d9ddc4ab92 AUX readline-6.2-rlfe-tgoto.patch 379 BLAKE2B 363dee5501fa9449eeee0647f1ae65106e28ad06af16c8aefe372a081eb5cd62b01a7cf2109ce5b3fc6577b6056f3a0206e3cc53f22d0a69f4d273930e3e2ab6 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c AUX readline-6.3-fix-long-prompt-vi-search.patch 736 BLAKE2B 1439a22ce82d51dd7cfb4bd1436475dce1d566fb2cc592e8161400e62e2790eff4a21c0634ef99f5da75efb21583514b90d47bb574b97374239fbd7ebb13fde8 SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0 AUX readline-6.3-read-eof.patch 1913 BLAKE2B 85cbba295d21de00af7cfa361d7976aabfb1110d860256224138a1844288f869f5225c296800aba5f637c892a988f834dddf184d06d308ae3da94cccb00ee5c4 SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 -AUX readline-7.0-headers.patch 576 BLAKE2B 21acf9f2b830bf9082e41043e9fac79e27c6aa1da153cdbf50a5c6a4e768a753a3b18a5ebaeffa80a32cf285a364940782a91ccef41072b0d50025a61c7d42f4 SHA512 51b7acaed6078ffe4bc4f3c2565d21c426d4507e9ae59b03bbbd5d4eeb956896e07929528d4070285c92e022f0eecb9fad86eadb694d845e3d49dc791b0b20ff -AUX readline-7.0-missing-echo-proto.patch 492 BLAKE2B 024ce483d7eb9ac670adefb28cda1b0da995f33826335c3f79ebb1eff322e3d7682656a57119459037425c7fe09f7d6975a7fb9f0505105f1e559448ce661413 SHA512 481ff7fb7dbe5eaea24b378d12deb78b6cb3f80ef89239b9ac1bcf6fa4bf1d05bfc93c1bf24da0983bee6b4c2e2665bac6788ba23b74208d5ae67ec4c4a76d88 +AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d80f4c2fd984eb11ef7f0fb48776ba8938d1c8be23087b328ce9b3ad0acd668f5bb4f0bda77b4a992119688a37191 SHA512 fec3d20e1581f35609a9d9f9ee1f48df8f9aa781e1a2cdcde2edf7d149624b5770867feb65a7ba142276d95a3133b768f5589e8041049aa0cf30068d0637b938 +AUX readline-7.0-mingw.patch 4464 BLAKE2B 00ca79f7ee128a78d76c3e0adcb8b51f6d3027718cc3a7b2b11660cd4aa9c61b4da15c893c9ad0595becf2c393c0d9e7597b5a772085bfc82974568c30f5b381 SHA512 f416f265c51f4cb05467c29c29abcaabf40ae29d66bb5d3288d35403ccc26903f2a22afef43382e39d7b13ba62732082c60d8f8d10abf7cf7955ee50fc23531b +AUX readline-7.0-missing-echo-proto.patch 466 BLAKE2B 251660f1321a36231774d5f03fea971a047688918a8f6498e019cadca43314097aee89ef8a96b104a5382ba0baa1037d500143f4d66e881da76d23f9385faaa9 SHA512 a8458bf62c73f79b980f375b98b33a6fbef59dec28386cd5266e4742a9cf70673e567f999d5682e538a2a47388d6f123d8a4fe4cfe34f19c28d4dafd93a9e10a DIST readline-4.3.tar.gz 961662 BLAKE2B a7267200b79c8010d08f8aaa4e0ed357eaddb970287b262404074a1e50b0d7865bcee5492730808dc998799a1b64685d3bd91fb7098d1da778e40a2364f16126 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 DIST readline-5.2.tar.gz 2037705 BLAKE2B df1012925f7cac8aa5d513097de97fa55c801993fbcf651e64468c0255cb27f7a2357613f8ab67791ab7799def57bde34376d3c41e65285689318f4b9cbedf84 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 DIST readline-6.3.tar.gz 2468560 BLAKE2B 24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 @@ -41,5 +42,6 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393 EBUILD readline-4.3_p5.ebuild 1541 BLAKE2B 15f7b523780d1b2b48ffec6ce2a9b18152c67efa28557f67b17f23dfd55a5a0712333f47b0348183a345a947aef53f184170b8c6470669bf7da58cedc05241b8 SHA512 3675fb0346094bf360035c5a9e3ffe1577b284024b0d5287a121999db7f81b5c40caddd9f71ec76c76d63216df6b094c98aeac0eb5ccbf9bde6d265506d0df03 EBUILD readline-5.2_p14.ebuild 1598 BLAKE2B c3ecb5f6130c10718b55db1a3e1d092cfce68d9b0f3cea3ccdf5fe673ebb5ed8efd043d0bf6d6800f432bb03d2c820debcadb6f7df1a0aa3580529bde04b5073 SHA512 bfcfdba85b3d11a3e977007e20ca5d023723aaaf62b03b216db86d8484ffaeeb268bf247f6fc3cb6222c67a9ad1591ef03e020dde08366c8c043e83b337af887 EBUILD readline-6.3_p8-r3.ebuild 4524 BLAKE2B 352f23a25d9b045ac18f91efee5f3482a2c5a77c6b5883acc971c5df1ecdb5d8ddeed02334760a715bd9d088a7a05352a3d8f6422da08943c5b1f41cf6d43dda SHA512 8ea86f96e4edf7255df8264d62fdd15c29682163512845d9df26a8e7c5961a98f5f7f00df5c8f2c659d690eacfe24d9cce35b1fa3a15ff7eb964d7f2d9357767 +EBUILD readline-7.0_p3-r1.ebuild 4853 BLAKE2B afc37cd6a51635a00add5b5b93e8df8dede30297fb9e4bd8a8ca27dc8ec447900c4437c0a5cea194c7ca064ee4d3a97871512ee514b2630db2d9551f14a69f52 SHA512 0d7d193777b82239531082564ca0d24012cdcd2f71e374a30a4230a809ba7dea8ddba0e2a4ec7fcee0b4600de2ae862180229d353795ecc6415d70b15d5e31ea EBUILD readline-7.0_p3.ebuild 4611 BLAKE2B 46af5c49a46b96ee46508fa51d57f0398eb6c3c88a96b96a1226122340b66a72afecb8b0a008dfdfdb5cc773e41f9951e7c86b2388d6a244b1e1ef703a8a5268 SHA512 03d4d0cc432f642d42972587b436f56e4ddf165f7fd545d09e87da583ad5f234d97bc1f88471b5810b7e9442dd722b50390ba28167c5ebdd638e95b151700efa MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784 diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sys-libs/readline/files/readline-5.0-no_rpath.patch index 624b2d7dea2b..befad63e4253 100644 --- a/sys-libs/readline/files/readline-5.0-no_rpath.patch +++ b/sys-libs/readline/files/readline-5.0-no_rpath.patch @@ -1,7 +1,7 @@ ripped from Fedora ---- support/shobj-conf -+++ support/shobj-conf +--- a/support/shobj-conf ++++ b/support/shobj-conf @@ -102,7 +102,7 @@ SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sys-libs/readline/files/readline-7.0-headers.patch b/sys-libs/readline/files/readline-7.0-headers.patch index dfe4e22ad1ae..892ec21f51e5 100644 --- a/sys-libs/readline/files/readline-7.0-headers.patch +++ b/sys-libs/readline/files/readline-7.0-headers.patch @@ -9,8 +9,8 @@ Subject: [PATCH] include ctype.h for isdigit usage diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c index 46a99aa62e30..13248db83048 100644 ---- a/lib/readline/histexpand.c -+++ b/lib/readline/histexpand.c +--- a/histexpand.c ++++ b/histexpand.c @@ -26,6 +26,7 @@ #endif diff --git a/sys-libs/readline/files/readline-7.0-mingw.patch b/sys-libs/readline/files/readline-7.0-mingw.patch new file mode 100644 index 000000000000..f003038d2c0f --- /dev/null +++ b/sys-libs/readline/files/readline-7.0-mingw.patch @@ -0,0 +1,152 @@ +--- a/colors.c ++++ b/colors.c +@@ -37,6 +37,10 @@ + #include "posixstat.h" // stat related macros (S_ISREG, ...) + #include <fcntl.h> // S_ISUID + ++#ifndef S_ISDIR ++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif ++ + // strlen() + #if defined (HAVE_STRING_H) + # include <string.h> +@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f + if (S_ISREG (mode)) + { + colored_filetype = C_FILE; +- ++#ifdef S_ISUID + if ((mode & S_ISUID) != 0 && is_colored (C_SETUID)) + colored_filetype = C_SETUID; +- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) ++ else ++#endif ++#ifdef S_ISGID ++ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) + colored_filetype = C_SETGID; +- else if (is_colored (C_CAP) && 0) //f->has_capability) ++ else ++#endif ++ if (is_colored (C_CAP) && 0) //f->has_capability) + colored_filetype = C_CAP; + else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) + colored_filetype = C_EXEC; +@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f + colored_filetype = C_STICKY; + #endif + } ++#if defined (S_ISLNK) + else if (S_ISLNK (mode)) + colored_filetype = C_LINK; ++#endif + else if (S_ISFIFO (mode)) + colored_filetype = C_FIFO; ++#if defined (S_ISSOCK) + else if (S_ISSOCK (mode)) + colored_filetype = C_SOCK; ++#endif + else if (S_ISBLK (mode)) + colored_filetype = C_BLK; + else if (S_ISCHR (mode)) +--- a/histfile.c ++++ b/histfile.c +@@ -606,12 +606,14 @@ history_truncate_file (fname, lines) + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + r = chown (filename, finfo.st_uid, finfo.st_gid); ++#endif + + xfree (filename); + FREE (tempname); +@@ -753,12 +755,14 @@ mmap_error: + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + mode = chown (histname, finfo.st_uid, finfo.st_gid); ++#endif + + FREE (histname); + FREE (tempname); +--- a/input.c ++++ b/input.c +@@ -71,6 +71,10 @@ extern int errno; + #include "rlshell.h" + #include "xmalloc.h" + ++#if defined (__MINGW32__) ++#include <conio.h> ++#endif ++ + /* What kind of non-blocking I/O do we have? */ + #if !defined (O_NDELAY) && defined (O_NONBLOCK) + # define O_NDELAY O_NONBLOCK /* Posix style */ +--- a/posixstat.h ++++ b/posixstat.h +@@ -78,30 +78,44 @@ + + #if defined (S_IFBLK) && !defined (S_ISBLK) + #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ ++#elif !defined (S_IFBLK) ++#define S_ISBLK(m) 0 + #endif + + #if defined (S_IFCHR) && !defined (S_ISCHR) + #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ ++#elif !defined (S_IFCHR) ++#define S_ISCHR(m) 0 + #endif + + #if defined (S_IFDIR) && !defined (S_ISDIR) + #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ ++#elif !defined (S_IFDIR) ++#define S_ISDIR(m) 0 + #endif + + #if defined (S_IFREG) && !defined (S_ISREG) + #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ ++#elif !defined (S_IFREG) ++#define S_ISREG(m) 0 + #endif + + #if defined (S_IFIFO) && !defined (S_ISFIFO) + #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ ++#elif !defined (S_IFIFO) ++#define S_ISFIFO(m) 0 + #endif + + #if defined (S_IFLNK) && !defined (S_ISLNK) + #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ ++#elif !defined (S_IFLNK) ++#define S_ISLNK(m) 0 + #endif + + #if defined (S_IFSOCK) && !defined (S_ISSOCK) + #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ ++#elif !defined (S_IFSOCK) ++#define S_ISSOCK(m) 0 + #endif + + /* +@@ -137,6 +151,8 @@ + /* These are non-standard, but are used in builtins.c$symbolic_umask() */ + #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) + #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) ++#if defined(S_IXUSR) && defined(S_IXOTH) + #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) ++#endif + + #endif /* _POSIXSTAT_H_ */ diff --git a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch index fe945be72530..cad3c8ca2c44 100644 --- a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch +++ b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch @@ -2,8 +2,8 @@ https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html fix from upstream ---- a/lib/readline/readline.h -+++ b/lib/readline/readline.h +--- a/readline.h ++++ b/readline.h @@ -413,6 +413,7 @@ extern void rl_tty_set_default_bindings PARAMS((Keymap)); extern void rl_tty_unset_default_bindings PARAMS((Keymap)); diff --git a/sys-libs/readline/readline-7.0_p3-r1.ebuild b/sys-libs/readline/readline-7.0_p3-r1.ebuild new file mode 100644 index 000000000000..ceeb39505bdc --- /dev/null +++ b/sys-libs/readline/readline-7.0_p3-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic multilib-minimal toolchain-funcs + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +[[ ${PV} != *_p* ]] && PLEVEL=0 +patches() { + [[ ${PLEVEL} -eq 0 ]] && return 1 + local opt=$1 + eval set -- {1..${PLEVEL}} + set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") + if [[ ${opt} == -s ]] ; then + echo "${@/#/${DISTDIR}/}" + else + local u + for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do + printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" + done + fi +} + +DESCRIPTION="Another cute console display library" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" + +case ${PV} in + *_alpha*|*_beta*|*_rc*) + SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + ;; + *) + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + ;; +esac + +LICENSE="GPL-3" +SLOT="0/7" # subslot matches SONAME major +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="static-libs utils" + +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-5.0-no_rpath.patch + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + "${FILESDIR}"/${PN}-7.0-headers.patch + "${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch + "${FILESDIR}"/${PN}-7.0-mingw.patch +) + +# Needed because we don't want the patches being unpacked +# (which emits annoying and useless error messages) +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) + default + + # Force ncurses linking. #71420 + # Use pkg-config to get the right values. #457558 + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) + sed -i \ + -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ + support/shobj-conf || die + sed -i \ + -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ + examples/rlfe/configure || die + + # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # objformat for years, so we don't want to rely on that. + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die + + ln -s ../.. examples/rlfe/readline || die # for local readline headers +} + +src_configure() { + # fix implicit decls with widechar funcs + append-cppflags -D_GNU_SOURCE + # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free + + # Make sure configure picks a better ar than `ar`. #484866 + export ac_cv_prog_AR=$(tc-getAR) + + # Force the test since we used sed above to force it. + export bash_cv_termcap_lib=ncurses + + # Control cross-compiling cases when we know the right answer. + # In cases where the C library doesn't support wide characters, readline + # itself won't work correctly, so forcing the answer below should be OK. + if tc-is-cross-compiler ; then + use kernel_Winnt || export bash_cv_func_sigsetjmp='present' + export bash_cv_func_ctype_nonascii='yes' + export bash_cv_wcwidth_broken='no' #503312 + fi + + # This is for rlfe, but we need to make sure LDFLAGS doesn't change + # so we can re-use the config cache file between the two. + append-ldflags -L. + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --with-curses + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + mkdir -p examples/rlfe || die + cd examples/rlfe || die + ECONF_SOURCE="${S}"/examples/rlfe \ + econf --cache-file="${BUILD_DIR}"/config.cache + fi +} + +multilib_src_compile() { + emake + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + cd examples/rlfe || die + local l + for l in readline history ; do + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die + ln -s ../../lib${l}.a lib${l}.a || die + done + emake + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi ; then + gen_usr_ldscript -a readline history #4411 + + if use utils && ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe + fi + fi +} + +multilib_src_install_all() { + HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs + dodoc USAGE + docinto ps + dodoc doc/*.ps +} +pkg_preinst() { + # bug #29865 + # Reappeared in #595324 with paludis so keeping this for now... + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6} +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6} +} diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest index f6e08060a56b..1ad7123b4c0a 100644 --- a/sys-libs/uclibc-ng/Manifest +++ b/sys-libs/uclibc-ng/Manifest @@ -2,8 +2,8 @@ AUX uclibc-compat-r1.patch 814 BLAKE2B 75fe9c5321171f3e378200e1c4d11792b3ea047fb DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b DIST uClibc-ng-1.0.28.tar.bz2 2299119 BLAKE2B 1f31b9a98fd669bad42ceeb1b8c33fd65994b0252707b532ad8a71c12f8bd0c4d99bc89ad919a1fbc2526efcf25d2e9f823f889c7c009da98e861269399c97a3 SHA512 9e77fece126b6ba6f9903a2fc5689a9f7efb335e38914a3806a7e0831033f5373a4b07e942d28876ed81a6a80b2d64b0fa122dccc4874db263d2d5fb7fef99ba DIST uClibc-ng-1.0.29.tar.bz2 2290382 BLAKE2B f6968397daaa66d75dff5508bdff4a3d05453a0657474b9ff167d14a0b0d715f22c61708060243efd1064922b4dd1e84987fe9cf1b13aa7bdb85e27b8c65a3b1 SHA512 7ab00f2a1c7a87f8d35b7bc51b7a8ad0f9120d8c117be8c03720c09b17d7f9f8b8a633ef7efa3e69f8d292b0357580f055f1542ad2257cff337056c9d3b5e207 -EBUILD uclibc-ng-1.0.26.ebuild 10529 BLAKE2B f8d3649613cadf6f30ec12d28cdf14e7b248982bc900da406bdefa291cc2fa90255dffd60f6e5f9dc41b811a21e6fc58b0b818755ae953c7a8849eaad4d143e1 SHA512 fdf65a81b649543661df14e6a50416d30694acb96a59bf6299cf3b0a83c40af0bd38aea9a212d396eac4ec0881bbceb84dcad374117db214a33ebfb74369300a -EBUILD uclibc-ng-1.0.28.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7 -EBUILD uclibc-ng-1.0.29.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7 -EBUILD uclibc-ng-9999.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7 +EBUILD uclibc-ng-1.0.26.ebuild 10527 BLAKE2B b3a1934999ee73c5d12f8ff9601236ece8b3a5a26f589f901344c4704ae9ccff941f5d6839faf5b7e153ada8e44d3e76eba2b67ad103d8fe274daa9d00e9bb27 SHA512 3f53c4201a477ce9c29f37b6c67177ab1f7c923dea153146ad192c13d465a3a939ad159825d491c18744d5d0c34c6263877b8c3fab061552cf74408b82248221 +EBUILD uclibc-ng-1.0.28.ebuild 10284 BLAKE2B bc67c39ae7c486f56a26448058706769454b2dfbe7cf5053ae855f3079495d184b5b772e6be76842df2c25a3f763982a56228070e643b8b7cb2adb4d190f7667 SHA512 2bee867278dc264688ea8ee516e6147f62568bf39758d0a098d32cb7de7b3a6024a6cb1ab9dc3726726a8fb477a92bd32fbf22f3ee375040a08295aa15a3462a +EBUILD uclibc-ng-1.0.29.ebuild 10284 BLAKE2B bc67c39ae7c486f56a26448058706769454b2dfbe7cf5053ae855f3079495d184b5b772e6be76842df2c25a3f763982a56228070e643b8b7cb2adb4d190f7667 SHA512 2bee867278dc264688ea8ee516e6147f62568bf39758d0a098d32cb7de7b3a6024a6cb1ab9dc3726726a8fb477a92bd32fbf22f3ee375040a08295aa15a3462a +EBUILD uclibc-ng-9999.ebuild 10284 BLAKE2B bc67c39ae7c486f56a26448058706769454b2dfbe7cf5053ae855f3079495d184b5b772e6be76842df2c25a3f763982a56228070e643b8b7cb2adb4d190f7667 SHA512 2bee867278dc264688ea8ee516e6147f62568bf39758d0a098d32cb7de7b3a6024a6cb1ab9dc3726726a8fb477a92bd32fbf22f3ee375040a08295aa15a3462a MISC metadata.xml 877 BLAKE2B 191277020e32edd39fc3a1594aaf3fad65ca7b48a2f0df3f0e381d3c7cc5451c09f9ad87a6da9e75b146c2ebe209918d699519582fc64fb8c3b7ae2e51eaf507 SHA512 3988e346916b283836e5c3d094eec4f25c66763e4e10a6413fe97f98629e1f14b67d6013f13f9ca2e2712dd638567973c02e6ebcce3554c55caf5483c3c9dfd4 diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild index f9471f6e42a4..3a53eceae511 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild @@ -14,10 +14,10 @@ else fi DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="http://www.uclibc-ng.org/" +HOMEPAGE="https://uclibc-ng.org/" if [[ ${PV} != "9999" ]] ; then PATCH_VER="" - SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" + SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" KEYWORDS="-* amd64 arm ~mips ~ppc x86" fi diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild index 507f8c13ae96..3b31357d8044 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="C library for developing embedded Linux systems" HOMEPAGE="https://uclibc-ng.org/" if [[ ${PV} != "9999" ]] ; then PATCH_VER="" - SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" + SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" fi diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild index 507f8c13ae96..3b31357d8044 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="C library for developing embedded Linux systems" HOMEPAGE="https://uclibc-ng.org/" if [[ ${PV} != "9999" ]] ; then PATCH_VER="" - SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" + SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" fi diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild index 507f8c13ae96..3b31357d8044 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="C library for developing embedded Linux systems" HOMEPAGE="https://uclibc-ng.org/" if [[ ${PV} != "9999" ]] ; then PATCH_VER="" - SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" + SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2" KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" fi |