From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- sys-devel/Manifest.gz | Bin 9500 -> 9505 bytes sys-devel/binutils-config/Manifest | 2 +- .../binutils-config/binutils-config-5.1-r1.ebuild | 4 +- sys-devel/binutils/Manifest | 5 +- sys-devel/binutils/binutils-2.30-r2.ebuild | 2 +- sys-devel/binutils/binutils-9999.ebuild | 37 ++++----- sys-devel/dev86/Manifest | 2 + sys-devel/dev86/dev86-0.16.21-r3.ebuild | 78 +++++++++++++++++++ sys-devel/dev86/files/dev86-0.16.21-make.patch | 82 ++++++++++++++++++++ sys-devel/gcc-apple/Manifest | 2 +- .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 10 ++- sys-devel/gcc/Manifest | 7 +- sys-devel/gcc/gcc-7.2.0-r1.ebuild | 24 ------ sys-devel/gcc/gcc-7.3.0-r1.ebuild | 24 ------ sys-devel/gcc/gcc-7.3.0-r3.ebuild | 2 +- sys-devel/multilib-gcc-wrapper/Manifest | 3 +- .../multilib-gcc-wrapper-0-r1.ebuild | 83 +++++++++++++++++++++ .../multilib-gcc-wrapper-0-r2.ebuild | 83 +++++++++++++++++++++ .../multilib-gcc-wrapper-0.ebuild | 71 ------------------ 19 files changed, 367 insertions(+), 154 deletions(-) create mode 100644 sys-devel/dev86/dev86-0.16.21-r3.ebuild create mode 100644 sys-devel/dev86/files/dev86-0.16.21-make.patch delete mode 100644 sys-devel/gcc/gcc-7.2.0-r1.ebuild delete mode 100644 sys-devel/gcc/gcc-7.3.0-r1.ebuild create mode 100644 sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild create mode 100644 sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild delete mode 100644 sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 3623205419b5..aaf76d900ba1 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index 806d14647b60..074f9f6e9c19 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -3,5 +3,5 @@ AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 EBUILD binutils-config-5-r4.ebuild 1116 BLAKE2B 43903ecf891d48aaa1a55aa76a0c3f786af3938305fce38074bc829f8201b6ba41760c31b956257a37dc39362330de90167f64134f381eb106b5749dc06067a9 SHA512 32586f809e5ec53b9d08204264711048c1fbf6e41ec1daf8f68a4573cc42e4b5c4698b9dd8cd333195f9548897eeb0edbc2fbc27b60b22302283d04b77c0a4b6 -EBUILD binutils-config-5.1-r1.ebuild 1157 BLAKE2B 49768c8153cbb252002683613e092c5f89bc568cbbee1104133a2ca80c097205115bb71314b8cef7d823d206571a50ead7eaff3636c5a843fc94d681b0ae23c0 SHA512 00052b682af413d74130a72571e4d0d111981bdda9a267f485fb56d7bd68de1393017c6b76beb99363c916da211d8cb25d65c605a3df9a917ca38ab1d942df2b +EBUILD binutils-config-5.1-r1.ebuild 1127 BLAKE2B 93c9c28be2c7b5b4c5fed373c3f363595591c7f6fca8ffe1e5867d9ee7faced22ea4062cdecc0499e6952184b1085af0b4996a7eb1a387ad566d7ef1780ffb6c SHA512 98ead262e3ed4a4e055f01d091dc3fc632095b135842658abbfa4830708832342cc40553cef2f1ff7b75e9e2cc7bfab06625ba5009bcfba375c2c2cd60ce546e MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild index 116cb5abf0d0..6edddd76dea5 100644 --- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild +++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild @@ -16,9 +16,7 @@ IUSE="" # We also RDEPEND on sys-apps/findutils which is in base @system RDEPEND="sys-apps/gentoo-functions - ! "${T}"/env.d TARGET="${CTARGET}" - VER="${BVER}" + VER="${PV}" LIBPATH="${EPREFIX}${LIBPATH}" EOF - newins "${T}"/env.d ${CTARGET}-${BVER} + newins "${T}"/env.d ${CTARGET}-${PV} # Handle documentation if ! is_cross ; then @@ -358,7 +359,7 @@ src_install() { pkg_postinst() { # Make sure this ${CTARGET} has a binutils version selected [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 - binutils-config ${CTARGET}-${BVER} + binutils-config ${CTARGET}-${PV} } pkg_postrm() { @@ -370,7 +371,7 @@ pkg_postrm() { # rerun binutils-config if this is a remerge, as # we want the mtimes on the symlinks updated (if # it is the same as the current selected profile) - if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') choice=${choice//$'\n'/ } choice=${choice/* } @@ -379,8 +380,8 @@ pkg_postrm() { else binutils-config ${choice} fi - elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then - binutils-config ${CTARGET}-${BVER} + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} fi } @@ -410,4 +411,4 @@ pkg_postrm() { # - at build-time set scriptdir to point to symlinked location: # ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) # - at install-time set scriptdir to point to slotted location: -# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER} +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest index 50f26741bb24..66c62a740eb0 100644 --- a/sys-devel/dev86/Manifest +++ b/sys-devel/dev86/Manifest @@ -1,6 +1,8 @@ AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696 +AUX dev86-0.16.21-make.patch 2299 BLAKE2B 7bc53ca455c545fe72b71a0daae8de8fd54da6ec915edfabd0d44acef2d3525936272fa666de5f6126013491d4b9f8b93f2086106177210d3490620eeec7771e SHA512 d75913f1c340a4601ca56cda5ad9cf389c0bac874b8f23e2a1362150e26d02ca3da53aee96a47136a3daf06b3020744680e3e479870199f1304bb2f9afd1ab45 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016 EBUILD dev86-0.16.21-r2.ebuild 1870 BLAKE2B e6da95b4a65b98d1215e109519c3400ed7b5189cacb1cda4cb0186bdb348134fd22b58b6e25ed2426c784e8a5e3ff0f11dc378ef642a361d200ff3323e9096d5 SHA512 5edc82cfd68a9e08bc5ef95b0fabfeca13bdf63a209ea3dfcb0730203bb7ca804c5c91aa60776668d6195c771f2ee38f55845f16b061b63a4ccc9a2bb561d9c3 +EBUILD dev86-0.16.21-r3.ebuild 1913 BLAKE2B e32fce5c10708bc9ed828fa68a73046387a3d1db19623b3347c9064d51c389e3d49a79f15fcb7e554386cc68aab5dca5d0ee584b574bcfd96d10f9dee4f7ea54 SHA512 20278dfad29f93bec24782379def485058ab8ec34ed5aaf0926af12dfc099a00bbe47828cf9bcd22e54320495bafb1e69b015df97ac75a5e92fcf4b8373cf5bf MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2 diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild new file mode 100644 index 000000000000..1ba9e30203d8 --- /dev/null +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code" +HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86" +SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="sys-devel/bin86" +DEPEND="${RDEPEND} + dev-util/gperf" + +PATCHES=( + "${FILESDIR}/${PN}-pic.patch" + "${FILESDIR}/${PN}-0.16.19-fortify.patch" + "${FILESDIR}/${P}-non-void-return-clang.patch" + "${FILESDIR}/${PN}-0.16.21-make.patch" +) + +src_prepare() { + default + + # elksemu doesn't compile under amd64 + if use amd64; then + einfo "Not compiling elksemu on amd64" + sed -i \ + -e 's,alt-libs elksemu,alt-libs,' \ + -e 's,install-lib install-emu,install-lib,' \ + makefile.in || die + fi + + sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die + sed -i -e "s:/lib/:/$(get_libdir)/:" bcc/bcc.c || die + sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die + sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die +} + +src_compile() { + # Don't mess with CPPFLAGS as they tend to break compilation + # (bug #343655). + unset CPPFLAGS + + # First `make` is also a config, so set all the path vars here + emake -j1 \ + DIST="${D}" \ + CC="$(tc-getCC)" \ + LIBDIR="/usr/$(get_libdir)/bcc" \ + INCLDIR="/usr/$(get_libdir)/bcc" + + export PATH=${S}/bin:${PATH} + + cd bin || die + ln -s ncc bcc || die + cd .. || die + + cd bootblocks || die + emake DIST="${D}" +} + +src_install() { + emake -j1 install-all DIST="${D}" + dostrip -x "/usr/*/bcc/lib*.a /usr/*/i386/libc.a" + + dobin bootblocks/makeboot + # remove all the stuff supplied by bin86 + rm "${D}"/usr/bin/{as,ld,nm,objdump,size}86 || die + rm "${D}"/usr/man/man1/{as,ld}86.1 || die + + dodir /usr/share + mv "${D}"/usr/{man,share/man} || die +} diff --git a/sys-devel/dev86/files/dev86-0.16.21-make.patch b/sys-devel/dev86/files/dev86-0.16.21-make.patch new file mode 100644 index 000000000000..248ff5814dbc --- /dev/null +++ b/sys-devel/dev86/files/dev86-0.16.21-make.patch @@ -0,0 +1,82 @@ +From f14f78efcd5c865b470173dc06959c8de61e9711 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 8 Mar 2018 19:31:17 +0100 +Subject: [PATCH] build: Always use $(MAKE) to spawn sub-make + +Always use $(MAKE) instead of literal 'make' to spawn the correct make +variant. Otherwise, e.g. when using 'gmake' on FreeBSD the Makefiles +spawn BSD make and things fail because of incompatible MAKEFLAGS +set by GNU make. +--- + bootblocks/Makefile | 10 +++++----- + libbsd/Makefile | 2 +- + makefile.in | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/bootblocks/Makefile b/bootblocks/Makefile +index d954ea1..2887d86 100644 +--- a/bootblocks/Makefile ++++ b/bootblocks/Makefile +@@ -55,31 +55,31 @@ fs_min.o: minix.h + + bootfile.sys: $(MSRC) $(MINC) + @rm -f $(MOBJ) +- make 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out ++ $(MAKE) 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out + mv monitor.out bootfile.sys + @rm -f $(MOBJ) + + boottar.sys: $(MSRC) $(MINC) tarboot.bin + @rm -f $(MOBJ) +- make 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out ++ $(MAKE) 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out + mv monitor.out boottar.sys + @rm -f $(MOBJ) + + bootminix.sys: $(MSRC) $(MINC) minix.bin + @rm -f $(MOBJ) +- make 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out ++ $(MAKE) 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out + mv monitor.out bootminix.sys + @rm -f $(MOBJ) + + monitor.sys: $(MSRC) $(MINC) + @rm -f $(MOBJ) +- make monitor.out ++ $(MAKE) monitor.out + mv monitor.out monitor.sys + @rm -f $(MOBJ) + + monitor: $(MSRC) $(MINC) + @rm -f $(MOBJ) +- make 'CFLAGS=-ansi $(DEFS)' monitor.out ++ $(MAKE) 'CFLAGS=-ansi $(DEFS)' monitor.out + mv monitor.out monitor + @rm -f $(MOBJ) + +diff --git a/libbsd/Makefile b/libbsd/Makefile +index 2b29f72..722b86d 100644 +--- a/libbsd/Makefile ++++ b/libbsd/Makefile +@@ -29,7 +29,7 @@ install: all + install -m 644 $(LIBBSD) $(LIBDIR)/i86 + + tests: dummy +- make -C tests ++ $(MAKE) -C tests + + $(LIBBSD): $(OBJS) + $(AR) rc $(LIBBSD) $(OBJS) +diff --git a/makefile.in b/makefile.in +index b586da1..97ea519 100644 +--- a/makefile.in ++++ b/makefile.in +@@ -326,7 +326,7 @@ config: ; + #endif + + makec: +- echo 'cd $$1 ; shift ; make "$$@"' > makec ++ echo 'cd $$1 ; shift ; $(MAKE) "$$@"' > makec + chmod +x makec + + versions: bcc/version.h diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest index ba4ea7ee0111..f4cd04146eb9 100644 --- a/sys-devel/gcc-apple/Manifest +++ b/sys-devel/gcc-apple/Manifest @@ -12,5 +12,5 @@ DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725 DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6 -EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12931 BLAKE2B 0beb8dd135af7a60bb5f34684f605b0d141b1a2c595e97e5dc474c3c0d0444341ce3458e59d16561a42156feb7bce9e98adc0d705dff01e8fe3ac75bb1fa91f1 SHA512 0f2f6c8b0b99b36f06362d3834778b056af94c1066d470ac50ca6416a85851e3c2bd8fe4bc901c96daee6bf6063c138da7eecb0f355c7f7b1db433b07a17fd4f +EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13232 BLAKE2B ab895bb980a39ea7a509f8f9dd189a08a019ebd75b1ac5f177ed0fd5ab0be364322e9e3b0b1a60d514198016bf77fc3ea932f6912bccdad72a6899a720541c83 SHA512 2058c8ed2e068e1002601db46f988a9b7a5ebaecf12fa76308978b68a99f91e5e8ec1290f44732ce505276a854e28c6dc6a7f6dae1f52a84c04443ac67ff8ae3 MISC metadata.xml 530 BLAKE2B 9cbe53672ff6d681bda4893ac4630e70e80129fcfbd0abe5862eddb51008b60220b5c3bffa15177c9d5c0308d0569dfcec7eeaf2ea87042b28a32714efb83530 SHA512 29922e179098de072d1a5bd869ba4505a88ee1340ceb66b0898b58446ddd74b6a6dcc961b4a1445d2db3b95259c6cb31030b9c0b7ea036a92b303b7f7ac3b371 diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild index 1b20668b569d..22cbde635fe1 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild @@ -110,7 +110,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-darwin14.patch # bootstrapping might fail with host provided gcc on 10.4/x86 - if ! is_crosscompile && ! echo "int main(){return 0;}" | gcc -o "${T}"/foo \ + if ! is_crosscompile && ! echo "int main(){return 0;}" | $(tc-getCC) -o "${T}"/foo \ -mdynamic-no-pic -x c - >/dev/null 2>&1; then einfo "-mdynamic-no-pic doesn't work - disabling..." @@ -121,6 +121,14 @@ src_prepare() { || die "Failed to rewrite $XD" fi + if [[ ${CHOST} == powerpc*-darwin* ]] && \ + ! echo "int main(){return 0;}" | \ + $(tc-getCC) -o "${T}"/foo -no-cpp-precomp -x c - >/dev/null 2>&1; + then + einfo "-no-cpp-precomp not supported by compiler - disabling ..." + sed -i -e 's/-no-cpp-precomp//' configure.in configure || die + fi + epatch "${FILESDIR}"/${P}-perl-5.18.patch epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index baa698fb5e44..2e61ac0fab4a 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -68,9 +68,6 @@ DIST gcc-6.4.0-patches-1.3.tar.bz2 13617 BLAKE2B 6bfb1d70397e6ca4359e5d190e36003 DIST gcc-6.4.0-patches-1.4.tar.bz2 13451 BLAKE2B 9934558989405141ae22c941fc4f5b4fb9dc425b0f35b458ab9c2704b8fbf61975a93c3d0e4c9ebde0cc7f935be868e9ad7ebdd78441235b81316fcca339fc42 SHA512 6d94f1ac196deabc8fcd30215bcbec4bbb19924929ef11c3000c8bfa189c59d87f95d37ac8cb0ff2d59cc2fc632b5767dbb80cbe7a354084cb2bc5e14cfbabb2 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 -DIST gcc-7.2.0-patches-1.1.tar.bz2 9246 BLAKE2B f6eec8459e5ac1f177d9a417c59616ad53e4ba6da8744cf55922d3a401717bd5bfdf79296a1c0b856cfa03349e73b8034ab6024b83d3f5ef909534811ba470f2 SHA512 d08b31d1279cc4c6ba46b2dca6ebed4e5c8e4997f0859acab86c974209ce4aacd0df09632e70c3fb8ee7108ecb8208c8b8605e66a7e8d2568e45644bfeee4fbe -DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 -DIST gcc-7.3.0-patches-1.1.tar.bz2 7439 BLAKE2B b6eff6f96cf4daf7b8debc767dc5ee1924a27be95c0a9a5d5ba957978f224c0907570e1492398865c4fa27d3b8f7c2f0fea2da813bf6b4ebb0fa66f9ccca9c46 SHA512 864a433c8f153a216c1028c553ffc3c84c474498c637ca6978e86fbb2ce4c07291c2561aabc2caa4953c012b8e18c277383ca153d56e13006967680119f9bcfa DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 DIST gcc-8.1.0-patches-1.3.tar.bz2 10713 BLAKE2B 3e5cddf5b0c0b9b2bbd2b0aa546dc3aee9bf0e8421656c9260bb7561baa8bb53f7b6ad651bf12d68102fd9e9f97fa17c3306d52a657a46d2dedd16e9a1a74579 SHA512 37c785fbfd801d48c46c65e21d33085c1470942531b8f13c28f933debcec944a1389a50fe0f72afa7dbba25a931959a3ebb1c42911abadd11ee530812f1034bb @@ -92,8 +89,6 @@ EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B 22b567881a1abbccc5622724141d50c5344c3da7c02ed58d59775e1b0861d556a01bf06de3908115f47d22a204468850a8a57f9e088ad241f05bb004a6bad295 SHA512 c5638c9a78270e06db2423acd6a5a109befb0b883d569ed8978ecd6c7755ecce5ff3450a91ee2fe12a3dda88717b31364dce0e621cd475307dec18f204fc8cfe EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6 EBUILD gcc-6.4.0-r2.ebuild 593 BLAKE2B 818b2c9e89d0309b5c12b6eda290f40607e2a2cbd456072eaefe9409c3140c614bd2e30618d7204fa0b7caf54f8754a007c17263f3f3e53def586a83d4fe717e SHA512 6ee2a73319826a51d2db816490a04a2c2ce740570089c3bd711243b8b1561b6b14aa7eacb3eaefccd867a1e18d32749b45f1f7c865c3568b62a0fc21dbbcc76e -EBUILD gcc-7.2.0-r1.ebuild 536 BLAKE2B c49fc3fc2d74e828ede929ad94484371cc1a7ccb6e3198ff6127aa755f2af20ef56d1319d3ecdd4dc00c2d318c8b5406a5476eb2519c9358f99683db4f9b5896 SHA512 307cfe3c63d2b4238b8493d7047e7266430fafc48625f07ac1d850fa696a95411b5dd8f335a0f7e51fa17396f1ec3c644e240bfd5e086fff2a7b0eb2e68a3697 -EBUILD gcc-7.3.0-r1.ebuild 536 BLAKE2B c49fc3fc2d74e828ede929ad94484371cc1a7ccb6e3198ff6127aa755f2af20ef56d1319d3ecdd4dc00c2d318c8b5406a5476eb2519c9358f99683db4f9b5896 SHA512 307cfe3c63d2b4238b8493d7047e7266430fafc48625f07ac1d850fa696a95411b5dd8f335a0f7e51fa17396f1ec3c644e240bfd5e086fff2a7b0eb2e68a3697 -EBUILD gcc-7.3.0-r3.ebuild 547 BLAKE2B 6926b5af4c3bb0baf15cdfd4625f55cc675cbd7cd8835dbea729456f6506a9b148b529f1d03908e9a3691918ba949d4657cae2433f07052f988fd639b9911ac8 SHA512 65991641fcd30520720f51a06fede3b940ebc0f56b71198271ecd043a99318c052af685db5886eb9e73183104b9de758bdd7014c510e75beee9725a88aab6929 +EBUILD gcc-7.3.0-r3.ebuild 543 BLAKE2B f3ff221b0c7d302db188a257ec2a1fed03c131e7f9d3147242cb25104b656b75f715015358b922c5c2d23fc14238847520e22a5e3b1ebdd0b7779ea44ebe8ea2 SHA512 51cf0a3bf4eb06bfe0efe8ad960e9c4bec922ac0f70339f4940e5e490057d113e24d685a02e11abc9eb305539606a13bc56104209f14d4c97ffceb6caec8780b EBUILD gcc-8.1.0-r3.ebuild 577 BLAKE2B 891a45aa2515e3769f2ae7ec6c618a8cfcf88b9f2832a4f19ae477231823f3fb7d15234b4fcd225e3c51fe6e4c2a445f3a07417529c98c81792fb1550a484ea1 SHA512 3442b806a35ab0f04fe34771c885ee64f7bf218743ad8281c6e8739857ad7145fd4ffe73418378523dc3df1bdb24b423435a45b8b44029cf548b77677c97515e MISC metadata.xml 2591 BLAKE2B ac029d38d0b2001f9d21214ccd272347f16f541cae5b86a00aa24802af42cc5e85a6447c854ca540274b991c77112b6083fd710209a785638ad64f0d4c78292a SHA512 3691a50f215303f18c8624852dba09f9486fc3818a9dac770c1e4c1a4be15b1bc5291e2584ed7e48510160ce264e1eef26126c075cc7d09b62e1963cc84edc7d diff --git a/sys-devel/gcc/gcc-7.2.0-r1.ebuild b/sys-devel/gcc/gcc-7.2.0-r1.ebuild deleted file mode 100644 index e6437606334a..000000000000 --- a/sys-devel/gcc/gcc-7.2.0-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PATCH_VER="1.1" -#UCLIBC_VER="1.0" - -inherit toolchain - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.13 ) - >=${CATEGORY}/binutils-2.20" - -if [[ ${CATEGORY} != cross-* ]] ; then - PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -fi - -src_prepare() { - toolchain_src_prepare -} diff --git a/sys-devel/gcc/gcc-7.3.0-r1.ebuild b/sys-devel/gcc/gcc-7.3.0-r1.ebuild deleted file mode 100644 index e6437606334a..000000000000 --- a/sys-devel/gcc/gcc-7.3.0-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PATCH_VER="1.1" -#UCLIBC_VER="1.0" - -inherit toolchain - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.13 ) - >=${CATEGORY}/binutils-2.20" - -if [[ ${CATEGORY} != cross-* ]] ; then - PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -fi - -src_prepare() { - toolchain_src_prepare -} diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild b/sys-devel/gcc/gcc-7.3.0-r3.ebuild index 2a07a8634c30..5a8535549064 100644 --- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild +++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild @@ -8,7 +8,7 @@ PATCH_VER="1.4" inherit toolchain -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/multilib-gcc-wrapper/Manifest b/sys-devel/multilib-gcc-wrapper/Manifest index 1e39ed58d5ce..39b9c7efc29b 100644 --- a/sys-devel/multilib-gcc-wrapper/Manifest +++ b/sys-devel/multilib-gcc-wrapper/Manifest @@ -1,2 +1,3 @@ -EBUILD multilib-gcc-wrapper-0.ebuild 1523 BLAKE2B a7e7fa98c3a148473fa2ca30f71000904514d2dcd8b5dad6f245cb72c577623988cabd1e7ace59de517231b4119b1fb4dbe3c80fac562d3686291a707629e893 SHA512 3c52476f072da9c8626868ab44b5147fafcf05f07eced28268a45b000fc2bd8e82744f4a368d155f06b32af6f6126486f357a84f51986e3c6f146f85dcff0c61 +EBUILD multilib-gcc-wrapper-0-r1.ebuild 1836 BLAKE2B b66fbba658f674471be3a687ca2793460ec04635e2d00d572fe443e3dae1006376d727b675fec2a255628ac8e2da94429d16d39aef8bea188dcd1afe6dfa75d1 SHA512 f545bf6c88eb58d89ea5d220d93be7e848dbae4b23c1c9c61a191377e9c59ef0fa051e81ae7a61486ec8f7cb0bc9964cd01b52fda6d4053289f8000f67615c96 +EBUILD multilib-gcc-wrapper-0-r2.ebuild 1828 BLAKE2B f9fa2f2dbf7b0cc256df2a9469d7f1dbf787fceaf21558a8931aa4a67abf3d95d7e084fd7443246c7281cb15c5e459550581131c642c86eb356afd06d7aa19f6 SHA512 34ee91a978c506009a7624cac9696e7bd25dacab08d303c502a94ccaf90e344b442893949d69e2f88af9ec753097b25b49e7362704f32815296bc37de3b1d198 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild new file mode 100644 index 000000000000..d003e7aadf61 --- /dev/null +++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils multilib + +DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs" +HOMEPAGE="https://www.gentoo.org" +SRC_URI="" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="sys-devel/gcc:=" + +S=${WORKDIR} + +mkwrap() { + einfo " ${2}" + + cat > "${T}"/wrapper <<-_EOF_ + #!${EPREFIX}/bin/sh + exec ${1} $(get_abi_CFLAGS) "\${@}" + _EOF_ + + newbin "${T}"/wrapper "${2}" +} + +src_install() { + local host_prefix=${CHOST} + # stolen from sys-devel/gcc-config + # TODO: check if all of them actually support $(get_ABI_CFLAGS) + local tools=( + cpp cc gcc c++ g++ f77 g77 gcj gcjh gdc gdmd gfortran gccgo + ) + + cd "${EROOT%/}"/usr/bin || die + eshopts_push -s nullglob + + # same as toolchain.eclass + : ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} + : ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} + local ABI t e + for ABI in $(get_all_abis TARGET); do + [[ ${ABI} == ${TARGET_DEFAULT_ABI} ]] && continue + + einfo "Creating wrappers for ${ABI} ..." + for t in "${tools[@]}"; do + # look for both plain *-gcc and e.g. *-gcc-4.8.3 + # (but avoid *-gcc-nm) + # note: nullglob applied above + for e in ${host_prefix}[-]${t}{,-[0-9]*}; do + local newname=$(get_abi_CHOST)-${e#${host_prefix}-} + + einfo " ${newname}" + + cat > "${T}"/wrapper <<-_EOF_ + #!${EPREFIX}/bin/sh + exec ${e} $(get_abi_CFLAGS) "\${@}" + _EOF_ + + newbin "${T}"/wrapper "${newname}" + done + done + done + + eshopts_pop +} + +pkg_postinst() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi +} + +pkg_postrm() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow clean all + fi +} diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild new file mode 100644 index 000000000000..f670a006b51a --- /dev/null +++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs" +HOMEPAGE="https://www.gentoo.org" +SRC_URI="" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="sys-devel/gcc:=" + +S=${WORKDIR} + +mkwrap() { + einfo " ${2}" + + cat > "${T}"/wrapper <<-_EOF_ + #!${EPREFIX}/bin/sh + exec ${1} $(get_abi_CFLAGS) "\${@}" + _EOF_ + + newbin "${T}"/wrapper "${2}" +} + +src_install() { + local host_prefix=${CHOST} + # stolen from sys-devel/gcc-config + # TODO: check if all of them actually support $(get_ABI_CFLAGS) + local tools=( + cpp cc gcc c++ g++ f77 g77 gcj gcjh gdc gdmd gfortran gccgo + ) + + cd "${EROOT%/}"/usr/bin || die + shopt -s nullglob + + # same as toolchain.eclass + : ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} + : ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} + local ABI t e + for ABI in $(get_all_abis TARGET); do + [[ ${ABI} == ${TARGET_DEFAULT_ABI} ]] && continue + + einfo "Creating wrappers for ${ABI} ..." + for t in "${tools[@]}"; do + # look for both plain *-gcc and e.g. *-gcc-4.8.3 + # (but avoid *-gcc-nm) + # note: nullglob applied above + for e in ${host_prefix}[-]${t}{,-[0-9]*}; do + local newname=$(get_abi_CHOST)-${e#${host_prefix}-} + + einfo " ${newname}" + + cat > "${T}"/wrapper <<-_EOF_ + #!${EPREFIX}/bin/sh + exec ${e} $(get_abi_CFLAGS) "\${@}" + _EOF_ + + newbin "${T}"/wrapper "${newname}" + done + done + done + + shopt -u nullglob +} + +pkg_postinst() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi +} + +pkg_postrm() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow clean all + fi +} diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild deleted file mode 100644 index 8094a33d1a12..000000000000 --- a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="sys-devel/gcc:=" - -S=${WORKDIR} - -mkwrap() { - einfo " ${2}" - - cat > "${T}"/wrapper <<-_EOF_ - #!${EPREFIX}/bin/sh - exec ${1} $(get_abi_CFLAGS) "\${@}" - _EOF_ - - newbin "${T}"/wrapper "${2}" -} - -src_install() { - local host_prefix=${CHOST} - # stolen from sys-devel/gcc-config - # TODO: check if all of them actually support $(get_ABI_CFLAGS) - local tools=( - cpp cc gcc c++ g++ f77 g77 gcj gcjh gdc gdmd gfortran gccgo - ) - - cd "${EROOT%/}"/usr/bin || die - eshopts_push -s nullglob - - # same as toolchain.eclass - : ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} - : ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} - local ABI t e - for ABI in $(get_all_abis TARGET); do - [[ ${ABI} == ${TARGET_DEFAULT_ABI} ]] && continue - - einfo "Creating wrappers for ${ABI} ..." - for t in "${tools[@]}"; do - # look for both plain *-gcc and e.g. *-gcc-4.8.3 - # (but avoid *-gcc-nm) - # note: nullglob applied above - for e in ${host_prefix}[-]${t}{,-[0-9]*}; do - local newname=$(get_abi_CHOST)-${e#${host_prefix}-} - - einfo " ${newname}" - - cat > "${T}"/wrapper <<-_EOF_ - #!${EPREFIX}/bin/sh - exec ${e} $(get_abi_CFLAGS) "\${@}" - _EOF_ - - newbin "${T}"/wrapper "${newname}" - done - done - done - - eshopts_pop -} -- cgit v1.2.3