From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- sys-devel/Manifest.gz | Bin 9487 -> 9483 bytes sys-devel/binutils/Manifest | 2 +- sys-devel/binutils/binutils-2.30-r4.ebuild | 2 +- sys-devel/crossdev/Manifest | 2 + sys-devel/crossdev/crossdev-20181020.ebuild | 39 ++++ sys-devel/gdb/Manifest | 2 + sys-devel/gdb/files/gdb-8.2-tinfow.patch | 44 ++++ sys-devel/gdb/gdb-8.2-r1.ebuild | 261 +++++++++++++++++++++++ sys-devel/m4/Manifest | 3 +- sys-devel/m4/files/m4-1.4.18-glibc228.patch | 310 ++++++++++++++++++++++++++++ sys-devel/m4/m4-1.4.18.ebuild | 4 +- sys-devel/prelink/Manifest | 1 + sys-devel/prelink/prelink-99999999.ebuild | 66 ++++++ 13 files changed, 732 insertions(+), 4 deletions(-) create mode 100644 sys-devel/crossdev/crossdev-20181020.ebuild create mode 100644 sys-devel/gdb/files/gdb-8.2-tinfow.patch create mode 100644 sys-devel/gdb/gdb-8.2-r1.ebuild create mode 100644 sys-devel/m4/files/m4-1.4.18-glibc228.patch create mode 100644 sys-devel/prelink/prelink-99999999.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 67cafb4e8f65..f1346b56d2c0 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index 1a29018fa883..b75c91f87e96 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -26,7 +26,7 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289 EBUILD binutils-2.30-r2.ebuild 11851 BLAKE2B 877f1e096972b66f9cde62f23f5dd1d2bd1098d27a01eecadf667f5b1792271e50a4697908492bd9c2d3c0d688de1245cda86cd566c142d1fba4fb0265819d1d SHA512 2f257fc05336b0e2cb45bc48185df2f0d226683b81d2fe835f856fdda9843f2b32f3267d6d5b9d29fe3dcf61d827aa846acea59d705ada30ac2d9b69772cf92a EBUILD binutils-2.30-r3.ebuild 11864 BLAKE2B 18001b8d905368b565e15ab852cb0e18a3354cfc31db5f3799b0d84ab837dabc50a7e0bb2656622c972fb46525b8007fe641f4ef76e837006791ecca9aa46131 SHA512 ddeedc8aa8c1a72ea16855c15e4660e5db335b8d50e45444233c755928eb9138168819e7ea9998759e71dd6582b296445679333363e0f5abe62788d17417999f -EBUILD binutils-2.30-r4.ebuild 12031 BLAKE2B c7a34d2f9807b0bddcc5836af75f33b1fa396f3972b4c2fa8d09f97eb694203e22a773e23177497f807c0be14dca1b1b8e11ea9837ee442a037462a04505800e SHA512 8dc6c9aced9face3b6259d35190ef4b15020432aa522b8529cd40ffe14564f4e611e9bf3e2151c3dc2300dd2f323ffb098bf1ef8b84d69ec4e783a10729f269d +EBUILD binutils-2.30-r4.ebuild 12025 BLAKE2B 8709907900b0af3372d076eb5ccb6f6447d7c126948248593c15c7f98b8c5b8c5dd1d0630e4d515a19b4d354b8a6c52ecbbc458ed9e5708e409d62271974092d SHA512 8bfa5ab5888fef964bab40ae9d53e3dd5ee76a21c7303ce0ed8d44499ad8c631b269896d6b1177c790126502ace8d8affe81abbabdab5e5335ecc508dc45a091 EBUILD binutils-2.31.1-r1.ebuild 11982 BLAKE2B 87ec050dd2a1d568d40743cb2ee121246307af8f681ca7a21e0799b1b8c136427c0d1aa5040b7d67fcf4fe085d08887ea4cadc3d256c56e75cebca90cf183f74 SHA512 105f266b196eca929c5511ae8fbf7a80e74f641c8ffd790ecd36bd2e828eab5580941073f6de2cfaf834d3c7678e8023a847c001cc170d07ceb3ff590dd7b7c1 EBUILD binutils-2.31.1.ebuild 12062 BLAKE2B d733159c07280791ed54a721f3ea517b490899c0faaa7ac34ca1f7dcf7f2ac658a547dd41b0414f141c8d8dec74925d9bca7500859dc51bda4c0d3c8d6670d8a SHA512 b39036aaa8a9d53f0b7d12f6884ed3f2a414f0a6d8c9198d4fe4387a755d409441ddfb7d64368ffd39bb76ae69442365bef4c1929c648feb355b92d3bfddee2a EBUILD binutils-9999.ebuild 11887 BLAKE2B 22f26d379bf519b20672f745913d559ed8a0d5098bf7b721b5fd52718de791e46edb7a2b1f3748676dbeffda68d4c2ab36a993d05b8282d136be13e746175b53 SHA512 de5c353d38df1f386d95383f0a782e6220a279ebd4c44894042a2a92e418271371ea4e7e4d070996e6507599209ad0f89f458822b38c8c45b989894ec715b6c8 diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild index 9c417b75742d..bee5ec6cf227 100644 --- a/sys-devel/binutils/binutils-2.30-r4.ebuild +++ b/sys-devel/binutils/binutils-2.30-r4.ebuild @@ -35,7 +35,7 @@ case ${PV} in ;; esac SLOT="${BVER}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" # # The Gentoo patchset diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest index da816c7a6936..ce05ed2a24f2 100644 --- a/sys-devel/crossdev/Manifest +++ b/sys-devel/crossdev/Manifest @@ -4,11 +4,13 @@ DIST crossdev-20180508.tar.xz 26728 BLAKE2B ab92cac544ee787ca91c794191c51faeab99 DIST crossdev-20180731.tar.xz 26808 BLAKE2B eea12e6405546ca5a8409a853afdcbb25f3f2a7336c428b7c6a5d38b29d772989da7c0a59ce282ee925a9126e396bead17798a25bff1b5019a28ba0ef3bc55fc SHA512 245144b57242b7ae1bca65f457bfb60ec4fe1a4cb5f332dc5ac42d14740dda49e7e5266b10e60bebc84be7fabbac827335fcbc8e0dd74e24f423ddfef33edb7e DIST crossdev-20180818.tar.xz 26904 BLAKE2B 8fce23db9a00429ec8f8487a72cd5724200336bbd1d50ef62d1170cdd2ccb2b3255ba47c516b89f0394fd7e7c935842269eddeddbc308ffdd1194edd7cc916cd SHA512 11ecd46026c1ec673fc18e86d3cc8570341288b2cf4c4a54aa62d3afddb2ad3d3005a30f2b5b35264af89511975b532cb6014009d0f5ec0b18c0256f49196cb5 DIST crossdev-20180918.tar.xz 26984 BLAKE2B 67cbddfc1ee2a4e6b3cb443b2cb8ac9468067356b007306db01081ee5bb3335548d4a80ecd604510cf806d68190be2b67e73d0a3f25968a7ebc9eb478fdaac73 SHA512 daeb864a88de6a64ab72b7dd3024106b8afa1e6de0b143042466435d4df2b7da1e1a6b314d3f2c2b01fc273b722871352321054d1fc5158d6b7bbabc01ba327c +DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7e00f3b5ecc2db2efdf36efca102206b5c4c5633e5e4ee508f5433ff4e086460501462bacc86c2adb10cab33a0244 SHA512 dd7fa9522ce6f58684b54ddc57e088f19a8ad5392ff45ed5b2b1f95f4be7dbc753442adc1c2591a785d94070979200936ca713913e547e84ae02b05c83bf8cde EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33 EBUILD crossdev-20180410.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d EBUILD crossdev-20180508.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d EBUILD crossdev-20180731.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d EBUILD crossdev-20180818.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d EBUILD crossdev-20180918.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d +EBUILD crossdev-20181020.ebuild 902 BLAKE2B 4641f43a96ce6195f904fa8350c36becb6ab1e7b7be4035e4a225768ad11a072d1c8aea839948aec5871acb3376dd1127244feb5bba65666ec2b3fdc9f54a24a SHA512 eebf6782cbb43862064d3c2356860693e68d4e517ddc3c712feef4a6c1084d9ae43bd2518aa1b1e6b0f99b16ac0b85f33e12457f3fcca01d3233c2c02d389cc3 EBUILD crossdev-99999999.ebuild 911 BLAKE2B 4ae5b9af089c6ff5911dd16b91144b403ab40676dbbfeb93739835084bd2f8dc8b01c157d7042bef68c6620c2ff387dd76073dc26ebf3267a6b618bdbc806485 SHA512 0c495670181efe2b105768c7715e55d65a487ccaa3c2fd4ebbe5272e04425c40aec365ce3a248743b97dec49446ba07cda0d7d7f17dec94297c36182a9c456a6 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae diff --git a/sys-devel/crossdev/crossdev-20181020.ebuild b/sys-devel/crossdev/crossdev-20181020.ebuild new file mode 100644 index 000000000000..5df04406ba65 --- /dev/null +++ b/sys-devel/crossdev/crossdev-20181020.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://www.gentoo.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + || ( + >=sys-apps/portage-2.1 + sys-apps/portage-mgorny + ) + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions + !sys-devel/crossdev-wrappers" +DEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die + fi +} diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index d1f58ffa6916..7b06792204f2 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,4 +1,5 @@ AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623dce854c0b10c9d3925db0b09aeea7d3a6c788dbed3f3e4d338535b35c3913ce8ff57edaa3d5cb587612a9de96718ec7 SHA512 0891e407b9a97dc26d99cf91f01f1316076dc5c303ddfd49e535ccf442d70cfb1b3d0b078c28da7208009fc4674606be96467fbd9b3d6773d1fe12305d89bdb0 +AUX gdb-8.2-tinfow.patch 1629 BLAKE2B eb771e3ce9add5eeb6c9d87cec229fda6557eb907877ecb4461060b8869c8598891368bb83c9ae71f5840edc0d95c9fa6d7c386e78afb724fdeadf5d1619269f SHA512 a406922c3fa9c0264cb4250895783d433f59f88eda8df63e509bc8c43d6b55b540262f34dd6f57894958574d9f3412d9d6f46397c229515204d62b0e642570d2 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 @@ -12,6 +13,7 @@ EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed5 EBUILD gdb-8.1-r1.ebuild 7114 BLAKE2B ffb1e998275339b3cdcf5c6babb344171b7d533e15046b912b4096e57ed9d49543bc46ac8d20add3ca8f6805722312c4a441826f145daae5114279ad988d9ac1 SHA512 83dd71f26aa311982d23012899d8684a4a5ec132c134957ae969d151c5d3e56a10464da7fec7ae9383d47c44804bb2174ecea6ba176c267ad348412f9d598292 EBUILD gdb-8.1-r2.ebuild 7110 BLAKE2B 399cf3ef970f92d911a9a1b5eb2e4c0058e5c1f6c70a9c1e41919b45d046d2f704d865670d4dfd39f13d36dc9f4a19f22ba6082321ffb36b373de709c79e28d6 SHA512 95e0952c373b5f2e8d6013a281f2982c096c035ec01503ac36308f5bac29ec58d7775ad04375cb5702ecaa6d2509e178c1ed1cea8719fe662ce3868ca98500e7 EBUILD gdb-8.1.1.ebuild 7115 BLAKE2B 07455f6ec0eb8d32bd57f404b2e831accb70995e61bd82232c8150b6f6acec2690d8b9419245e006074d4e89aaf60ffcf6571c3b09099b5d4d0ca2b11ea11318 SHA512 41864e8336b484cd7fbddac2151d567821923545442e8ed4c6717e928c76b72c5a843eab5d35b053eaf9a94ff3435e617ef68a8ff705f99752fb90ea5ef20699 +EBUILD gdb-8.2-r1.ebuild 7269 BLAKE2B dddd371aa22c1b24ff256126aefc0491228881530f16a45eb2ec572c1e6a3f91db5d81ffaa9619bc691e0fc3667083f41373039483b0832cc93c095b45f2b946 SHA512 e33c85dc69973cf51f003f6fbee914e618bdd9036c83841704ac3091ddb8dd2bcfe55439a13ed87ae94d1ec55ea85fcb3c799d0d9bd4c2ffb696052d27e02c1b EBUILD gdb-8.2.ebuild 7232 BLAKE2B 50ae71f70afbbbd0198394b6a638a68b29c3be243add4178b5fb2c4d5d2d6e940875c0e677d24cb1af16ee79d3c15cf99ed1160c36830e9c71fd6f92ea86f71d SHA512 ce0d2accd9d22baf1842737129925554291b1c4c9fa7f45cb853712a9ce5984d3305ab77721095d2483db1eddb025aa36b766195c98d404bcd9aec1bfff52a90 EBUILD gdb-9999.ebuild 7082 BLAKE2B bb3a92633e1bd39084f0188474cfc2e5df6c2a3421edc7d6a884dc1b0b3474a631b8c82222f46fda2fb8af16d68ee722734d5276674a1a2fc38d5ffde2863f27 SHA512 8364ce6883ede62ca5e863781309bf832402e7f67400dc5f67539f5b47566692b82ca8324e6bcebe5001fbe2f4688302aa4f2b6e90bf455c17b7d174ab5947eb MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c diff --git a/sys-devel/gdb/files/gdb-8.2-tinfow.patch b/sys-devel/gdb/files/gdb-8.2-tinfow.patch new file mode 100644 index 000000000000..48f6109664a2 --- /dev/null +++ b/sys-devel/gdb/files/gdb-8.2-tinfow.patch @@ -0,0 +1,44 @@ +Try to link gdb against tinfow first, then tinfo. + +In bug #669096 gdb was directly linked both +to libtinfo.so.6 and libncursesw.so.6: + $ lddtree /usr/bin/gdb + /usr/bin/gdb (interpreter => /lib64/ld-linux-x86-64.so.2) + libtinfo.so.6 => /lib64/libtinfo.so.6 + libncursesw.so.6 => /lib64/libncursesw.so.6 + libtinfow.so.6 => /lib64/libtinfow.so.6 + ... +and caused gdb to SIGSEGV at start. + +Let's consistently link against *w libraries. + +Note: the fix on it's own is not enough: +- we don't pass include paths to ncursesw libraries +- libreadline.so.7 is still linked against libtinfo.so.6 in Gentoo + and needs a separate fix. + +But it's enough to make immediate SIGSEGV to go away. + +Reported-by: Michał Górny +Bug: https://bugs.gentoo.org/669096 +--- a/gdb/configure.ac ++++ b/gdb/configure.ac +@@ -616,4 +616,4 @@ esac + +-# These are the libraries checked by Readline. +-AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncursesw ncurses]) ++# These are the libraries checked by Readline. Not really: readline does not know about *w libs. ++AC_SEARCH_LIBS(tgetent, [termcap tinfow tinfo curses ncursesw ncurses]) + +--- a/gdb/configure ++++ b/gdb/configure +@@ -8984,3 +8984,3 @@ esac + +-# These are the libraries checked by Readline. ++# These are the libraries checked by Readline. Not really: readline does not know about *w libs. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 +@@ -9009,3 +9009,3 @@ return tgetent (); + _ACEOF +-for ac_lib in '' termcap tinfo curses ncursesw ncurses; do ++for ac_lib in '' termcap tinfow tinfo curses ncursesw ncurses; do + if test -z "$ac_lib"; then diff --git a/sys-devel/gdb/gdb-8.2-r1.ebuild b/sys-devel/gdb/gdb-8.2-r1.ebuild new file mode 100644 index 000000000000..d7f7e1ef262d --- /dev/null +++ b/sys-devel/gdb/gdb-8.2-r1.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit epatch eutils flag-o-matic python-single-r1 + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +RPM= +MY_PV=${PV} +case ${PV} in +9999*) + # live git tree + EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + SRC_URI="" + ;; +*.*.50.2???????) + # weekly snapshots + SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" + ;; +*.*.*.*.*.*) + # fedora versions; note we swap the rpm & fedora core versions. + # gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild + # gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild + inherit versionator rpm + gvcr() { get_version_component_range "$@"; } + parse_fedora_ver() { + set -- $(get_version_components) + MY_PV=$(gvcr 1-$(( $# - 2 ))) + RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm" + } + parse_fedora_ver + SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}" + ;; +*) + # Normal upstream release + SRC_URI="mirror://gnu/gdb/${P}.tar.xz + ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" + ;; +esac + +PATCH_VER="1" +PATCH_DEV="slyfox" +DESCRIPTION="GNU debugger" +HOMEPAGE="https://sourceware.org/gdb/" +SRC_URI="${SRC_URI} + ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz} + ${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz} +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +IUSE="+client lzma multitarget nls +python +server test vanilla xml" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + || ( client server ) +" + +RDEPEND=" + server? ( !dev-util/gdbserver ) + client? ( + dev-libs/mpfr:0= + >=sys-libs/ncurses-5.2-r2:0= + sys-libs/readline:0= + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + xml? ( dev-libs/expat ) + sys-libs/zlib + )" +DEPEND="${RDEPEND} + app-arch/xz-utils + sys-apps/texinfo + client? ( + virtual/yacc + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + )" + +S=${WORKDIR}/${PN}-${MY_PV} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec + + # upstreamed + EPATCH_EXCLUDE+=" 01_all_ia64-TRAP_HWBKPT.patch" + EPATCH_EXCLUDE+=" 02_all_solaris-no-uuidsys.patch" + ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + eapply "${FILESDIR}"/${P}-tinfow.patch + + default + + strip-linguas -u bfd/po opcodes/po +} + +gdb_branding() { + printf "Gentoo ${PV} " + if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi + [[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" +} + +src_configure() { + strip-unsupported-flags + + local myconf=( + --with-pkgversion="$(gdb_branding)" + --with-bugurl='https://bugs.gentoo.org/' + --disable-werror + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{binutils,etc,gas,gold,gprof,ld} + ) + local sysroot="${EPREFIX}/usr/${CTARGET}" + is_cross && myconf+=( + --with-sysroot="${sysroot}" + --includedir="${sysroot}/usr/include" + --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" + ) + + if use server && ! use client ; then + # just configure+build in the gdbserver subdir to speed things up + cd gdb/gdbserver + myconf+=( --program-transform-name='' ) + else + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on. + is_cross \ + && myconf+=( --disable-gdbserver ) \ + || myconf+=( $(use_enable server gdbserver auto) ) + fi + + if ! ( use server && ! use client ) ; then + # if we are configuring in the top level, then use all + # the additional global options + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + # Disable guile for now as it requires guile-2.x #562902 + --without-guile + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + ) + fi + if use sparc-solaris || use x86-solaris ; then + # disable largefile support + # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html + myconf+=( --disable-largefile ) + fi + + econf "${myconf[@]}" +} + +src_test() { + nonfatal emake check || ewarn "tests failed" +} + +src_install() { + if use server && ! use client; then + cd gdb/gdbserver || die + fi + default + if use client; then + find "${ED}"/usr -name libiberty.a -delete || die + fi + cd "${S}" || die + + # Delete translations that conflict with binutils-libs. #528088 + # Note: Should figure out how to store these in an internal gdb dir. + if use nls ; then + find "${ED}" \ + -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ + -delete || die + fi + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -rf "${ED}"/usr/share/{doc,info,locale} || die + local f + for f in "${ED}"/usr/share/man/*/* ; do + if [[ ${f##*/} != ${CTARGET}-* ]] ; then + mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die + fi + done + return 0 + fi + # Install it by hand for now: + # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html + # Only install if it exists due to the twisted behavior (see + # notes in src_configure above). + [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay + + if use client ; then + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS + fi + docinto sim + dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} + if use server ; then + docinto gdbserver + dodoc gdb/gdbserver/{ChangeLog,README} + fi + + if [[ -n ${PATCH_VER} ]] ; then + dodoc "${WORKDIR}"/extra/gdbinit.sample + fi + + # Remove shared info pages + rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info* + + # gcore is part of ubin on freebsd + if [[ ${CHOST} == *-freebsd* ]]; then + rm "${ED}"/usr/bin/gcore || die + fi +} + +pkg_postinst() { + # portage sucks and doesnt unmerge files in /etc + rm -vf "${EROOT}"/etc/skel/.gdbinit + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "gdb is unable to get a mach task port when installed by Prefix" + ewarn "Portage, unprivileged. To make gdb fully functional you'll" + ewarn "have to perform the following steps:" + ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb" + ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb" + fi +} diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest index f9412c1fb107..fcaa68e37d56 100644 --- a/sys-devel/m4/Manifest +++ b/sys-devel/m4/Manifest @@ -1,7 +1,8 @@ AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf +AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46 DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 EBUILD m4-1.4.17.ebuild 1620 BLAKE2B 789c68b68c8265b799623fede4da9ab2aa344b67972d8abe220aa03c80732425ac474cbd01f0ac3538f8b110ce6dffd5d8844b9cad079cdde5fa283c9216e5e5 SHA512 e5642fde4f5f83daaeac3ab340abd845285d90320ac9c72b4465de4c06c05206c5bc9a3208f1fbf94609552b264de47ee1359e07b0d2c791cb160a4be605ff72 -EBUILD m4-1.4.18.ebuild 1402 BLAKE2B b74e5896824ead629906a4e42613a3cb427b9e52817be0e3f8296f0bcce1762f1709ab18506bb479ef40c87d64c5c781cf7e15a744b99f80fe2e4340313a39fb SHA512 602cf672efeeed2b4a210d5fc95e673e2019510e1ac1065e6c860312d6743a3ff94d4492ba39470ea2c167590685c9eb98293c17dc046c401b995d7e9573b401 +EBUILD m4-1.4.18.ebuild 1462 BLAKE2B 36c2f2cef7b4b3df2bae33314fcdd739620554fc482002e9f833db6bbc0a380ed37bed3200e440c3b54e97194e73824787df62a66c0871ca08da60737101ba1c SHA512 3ed2b17f679d3c61fb67ae3234dbe74b0130f304db957d97da30268fb28667ceb147c87fd160144874f51b5bbe984b31e796f3a98b3106f70a4f819ce6d6312b MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/m4/files/m4-1.4.18-glibc228.patch b/sys-devel/m4/files/m4-1.4.18-glibc228.patch new file mode 100644 index 000000000000..6b5593bfa639 --- /dev/null +++ b/sys-devel/m4/files/m4-1.4.18-glibc228.patch @@ -0,0 +1,310 @@ +Fix build failure on glibc-2.28: + fseeko.c: In function 'rpl_fseeko': + fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." + #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." + +Patch by milan hodoscek. + +https://bugs.gentoo.org/663924 +--- a/old/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -1,5 +1,5 @@ + /* Implementation details of FILE streams. +- Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -12,12 +12,18 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + /* Many stdio implementations have the same logic and therefore can share + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +@@ -29,10 +35,10 @@ + #include /* For detecting Plan9. */ + + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + # if defined __DragonFly__ /* DragonFly */ +- /* See . */ ++ /* See . */ + # define fp_ ((struct { struct __FILE_public pub; \ + struct { unsigned char *_base; int _size; } _bf; \ + void *cookie; \ +@@ -49,30 +55,84 @@ + fpos_t _offset; \ + /* More fields, not relevant here. */ \ + } *) fp) +- /* See . */ ++ /* See . */ + # define _p pub._p + # define _flags pub._flags + # define _r pub._r + # define _w pub._w ++# elif defined __ANDROID__ /* Android */ ++ /* Up to this commit from 2015-10-12 ++ ++ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, ++ see ++ and . ++ After this commit, the innards of FILE are hidden. */ ++# define fp_ ((struct { unsigned char *_p; \ ++ int _r; \ ++ int _w; \ ++ int _flags; \ ++ int _file; \ ++ struct { unsigned char *_base; size_t _size; } _bf; \ ++ int _lbfsize; \ ++ void *_cookie; \ ++ void *_close; \ ++ void *_read; \ ++ void *_seek; \ ++ void *_write; \ ++ struct { unsigned char *_base; size_t _size; } _ext; \ ++ unsigned char *_up; \ ++ int _ur; \ ++ unsigned char _ubuf[3]; \ ++ unsigned char _nbuf[1]; \ ++ struct { unsigned char *_base; size_t _size; } _lb; \ ++ int _blksize; \ ++ fpos_t _offset; \ ++ /* More fields, not relevant here. */ \ ++ } *) fp) + # else + # define fp_ fp + # endif + +-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ ++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ + /* See +- and */ ++ and ++ and */ + struct __sfileext + { + struct __sbuf _ub; /* ungetc buffer */ + /* More fields, not relevant here. */ + }; + # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub +-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ ++# elif defined __ANDROID__ /* Android */ ++ struct __sfileext ++ { ++ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ ++ /* More fields, not relevant here. */ ++ }; ++# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub ++# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ + # define fp_ub fp_->_ub + # endif + + # define HASUB(fp) (fp_ub._base != NULL) + ++# if defined __ANDROID__ /* Android */ ++ /* Needed after this commit from 2016-01-25 ++ */ ++# ifndef __SEOF ++# define __SLBF 1 ++# define __SNBF 2 ++# define __SRD 4 ++# define __SWR 8 ++# define __SRW 0x10 ++# define __SEOF 0x20 ++# define __SERR 0x40 ++# endif ++# ifndef __SOFF ++# define __SOFF 0x1000 ++# endif ++# endif ++ + #endif + + +@@ -81,7 +141,7 @@ + #ifdef __TANDEM /* NonStop Kernel */ + # ifndef _IOERR + /* These values were determined by the program 'stdioext-flags' at +- . */ ++ . */ + # define _IOERR 0x40 + # define _IOREAD 0x80 + # define _IOWRT 0x4 +@@ -99,6 +159,8 @@ + int _file; \ + unsigned int _flag; \ + } *) fp) ++# elif defined __VMS /* OpenVMS */ ++# define fp_ ((struct _iobuf *) fp) + # else + # define fp_ fp + # endif +@@ -110,7 +172,7 @@ + # define _flag __flag + # endif + +-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* newer Windows with MSVC */ ++#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ + + /* does not define the innards of FILE any more. */ + # define WINDOWS_OPAQUE_FILE +@@ -130,7 +192,7 @@ struct _gl_real_FILE + # define fp_ ((struct _gl_real_FILE *) fp) + + /* These values were determined by a program similar to the one at +- . */ ++ . */ + # define _IOREAD 0x1 + # define _IOWRT 0x2 + # define _IORW 0x4 +--- a/old/fseeko.c ++++ b/lib/fseeko.c +@@ -1,5 +1,5 @@ + /* An fseeko() function that, together with fflush(), is POSIX compliant. +- Copyright (C) 2007-2016 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -12,7 +12,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along +- with this program; if not, see . */ ++ with this program; if not, see . */ + + #include + +@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + #if _GL_WINDOWS_64_BIT_OFF_T + # undef fseeko +-# if HAVE__FSEEKI64 /* msvc, mingw64 */ ++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ + # define fseeko _fseeki64 +-# else /* mingw */ ++# else /* mingw before msvcrt8.0 */ + # define fseeko fseeko64 + # endif + #endif +@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + # if defined __SL64 && defined __SCLE /* Cygwin */ + if ((fp->_flags & __SL64) == 0) + { +@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #elif defined __minix /* Minix */ + if (fp_->_ptr == fp_->_buf + && (fp_->_ptr == NULL || fp_->_count == 0)) +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + if (fp_->_ptr == fp_->_base + && (fp_->_ptr == NULL || fp_->_cnt == 0)) + #elif defined __UCLIBC__ /* uClibc */ +@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence) + if (pos == -1) + { + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + fp_->_flags &= ~__SOFF; + #endif + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ ++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else +@@ -150,7 +152,7 @@ fseeko (FILE *fp, off_t offset, int whence) + fp_->_flags &= ~__SEOF; + #elif defined __EMX__ /* emx+gcc */ + fp->_flags &= ~_IOEOF; +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + fp_->_flag &= ~_IOEOF; + #elif defined __MINT__ /* Atari FreeMiNT */ + fp->__offset = pos; +--- a/old/freadahead.c ++++ b/lib/freadahead.c +@@ -1,5 +1,5 @@ + /* Retrieve information about a FILE stream. +- Copyright (C) 2007-2016 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -12,7 +12,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + #include + +@@ -22,17 +22,26 @@ + #include + #include "stdio-impl.h" + ++#if defined __DragonFly__ ++/* Defined in libc, but not declared in . */ ++extern size_t __sreadahead (FILE *); ++#endif ++ ++/* This file is not used on systems that have the __freadahead function, ++ namely musl libc. */ ++ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) + + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : + 0); + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) + return 0; + # if defined __DragonFly__ diff --git a/sys-devel/m4/m4-1.4.18.ebuild b/sys-devel/m4/m4-1.4.18.ebuild index 9c6670123534..378946733cae 100644 --- a/sys-devel/m4/m4-1.4.18.ebuild +++ b/sys-devel/m4/m4-1.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -20,6 +20,8 @@ RDEPEND="" src_prepare() { epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch + epatch "${FILESDIR}"/${P}-glibc228.patch #663924 + epatch_user default } diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest index 3b44a49698d8..5c23fecf453f 100644 --- a/sys-devel/prelink/Manifest +++ b/sys-devel/prelink/Manifest @@ -9,4 +9,5 @@ DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8f EBUILD prelink-20130503-r1.ebuild 2458 BLAKE2B 27df684421d5857a5727916bbcdbadca5d9e8847a1f8c0abafb892fc6af029932687c0819013416d36ad0182bf771ed89e238a8122cc83631b6cc5717ade8563 SHA512 2cc0e66fb48f2137bc9a8118d1ed97e58dd5725bd30b042c4276dad5df2d65ef8298e93cdaeb0b8b292c16ff255fa1ddacdc104150ac478e1bf8677869ce4939 EBUILD prelink-20130503.ebuild 2617 BLAKE2B 24308a12628eadef19728c07f6a2be21671e2119d6570fd7d2fe8cb7805a041edf4bb54cdc391b808d396e2585e54fbd0c2f46fe755ab35722bfcfd2690fa7c1 SHA512 4ba50aad1ba5e142f8a0c96d2ab73fca49712202c506a57af58e9fee5021446e6587f9715420244c39aef9f006baf8cfef7cd318e8e6e21f36aa590f7840cbc0 EBUILD prelink-20151030.ebuild 1737 BLAKE2B e8d5ee89e48725c4b054bb83a3f4867cce35cab2ac63a02a28a28044e0b169c1cfe547ea906fb38a91946769afbaa9a4ef2f6d8ec1969aa7dc646ab09fe5d1d7 SHA512 7889421c986260cac8f31d3eafe1e354bb78dec1e00f2fec5798a3347c845c4dd4ba973e5f0c0728d4efe993f393ea50607b5d00591488a0b38574d519d70f36 +EBUILD prelink-99999999.ebuild 1585 BLAKE2B 37746d0631d4a07c94f9ad71cc00512b4c485ce13b00ca84263be41f0e8a1b00a315764a845740fe3cee30cdd5acb7d87d41fc0be2d764a158fda62bcabc4df5 SHA512 5d844567440de565d363cff958b3027ce5a7e80a68e46dc2c10e2176bf2306788d4c2d86d6a92a83324a6264e6c374d8d48a38665535588c4b71ac07a03d7a5e MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild new file mode 100644 index 000000000000..390d0c35e0cd --- /dev/null +++ b/sys-devel/prelink/prelink-99999999.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_PN="${PN}-cross" +MY_P="${MY_PN}-${PV}" + +inherit autotools flag-o-matic git-r3 + +DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times" +HOMEPAGE="https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink" +EGIT_REPO_URI="https://git.yoctoproject.org/git/prelink-cross" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc selinux" + +DEPEND="selinux? ( sys-libs/libselinux[static-libs(+)] ) + !dev-libs/libelf + sys-libs/binutils-libs + >=sys-libs/glibc-2.8" +RDEPEND="${DEPEND} + >=sys-devel/binutils-2.18 + >=dev-libs/elfutils-0.100[static-libs(+)]" + +PATCHES=( + "${FILESDIR}"/${PN}-20130503-prelink-conf.patch + "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch +) + +src_prepare() { + default + + sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147 + + has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread + + eautoreconf +} + +src_configure() { + econf $(use_enable selinux) +} + +src_install() { + default + + use doc && dodoc doc/prelink.pdf + + insinto /etc + doins doc/prelink.conf + + exeinto /etc/cron.daily + newexe "${FILESDIR}"/prelink.cron prelink + newconfd "${FILESDIR}"/prelink.confd prelink +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ] ; then + elog "You may wish to read the Gentoo Linux Prelink Guide, which can be" + elog "found online at:" + elog " https://wiki.gentoo.org/wiki/Prelink" + elog "Please edit /etc/conf.d/prelink to enable and configure prelink" + fi +} -- cgit v1.2.3