gentoo resync : 19.10.2017

4 files changed, 49 insertions, 4 deletions

diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 6c8296a7fb85..3dc54cfb1316 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -1,11 +1,13 @@
 AUX aboot-define_stat_only_in_userspace.patch 930 SHA256 ba7b34d1361ff4635e0f4aa7118295d4b93fc8716333a23bbc8a4dbe4ddea5de SHA512 b219d941943e0780030e402773a5ca3d9d2b3779b0162ad464d636c06268d37fa99f80ab9f7585013ffdfb8e13c1661f533ff6dad08451b5fe778d0a3fa9bd4e WHIRLPOOL e1184bba6b69b340e1c6989175c873d5fc9cd2d33b0ee5f2a83b40924856d7f07883614b1f607f1507d094bab36746997e69fe5f7e81305005e0fe6a441d0705
 AUX aboot-gcc-3.4.patch 830 SHA256 9757c85226ec5355a849a24a71415604569a7de06036bcfb3e4814fa448b5d18 SHA512 9e5f95a18b7d2eac6ab589f86f0e7a7ba189642b5cf0b302324ea0e2de243bf0379f119c79d44a9aa6b59096a582878438d0a1b42c0b626650ba908777bf0760 WHIRLPOOL b2ed3e55f3be60c698396cc638036234811bff399f1322506b10fe5fac18f232d10539dabba8a575180436081255adcb0481fe6dbe3729d5c4cc4a443671cef6
+AUX aboot-gnu90.patch 1143 SHA256 3824bca4afd25dcd7cfd286999dd40e9c1b3d48a6e97c389f351044394460637 SHA512 9bfd140c7901dd5afb5972a7e118739e745647675fa875d4e5d16b1d0004b05233f193346f4eb00b7162352af4435fe07927aa59677a47be8d9d122c8363afab WHIRLPOOL c2fdf8dd171eeff6ef344ba8db086d870317da674e1b8a5b4ee86fb6b342c88574e314973ae8b521478fd95b5c34bee27c5e514f87c283752fdda719db568b1c
 AUX aboot-pt_note.patch 8966 SHA256 ef8a8e20bf482d0aa2cd4da09c867f021018fde486f6c631d7c236d790d81a2b SHA512 0df0be83d4f487ab899a37be494e90c926311dd39b49c953ab9fa97ac70a6430d697b62d8c12315fd6dcb0c7790d27eb6391754acecf440cbe0c363b050b5479 WHIRLPOOL bab6f78b9f6379f9ffd92478d9225b1ac8c4eda7f183de32a7407c9aa505554b21bfde38b0f73a6724e8aa9989f360d34fb0e369a225160e9a8d7111e7e24e6b
+AUX aboot-respect-AR.patch 302 SHA256 f53352a14e63c4ac3112bd40d784a924912651478f626426dd31a35614e33f08 SHA512 0c5288302b11c850abd673aea0c6edf8482d40d8c0189c9291f015cf088a3d39a70b0f562c1eaa27005b8119d095de3b3c052db21c5d6b3406e6a787f389e103 WHIRLPOOL 1176bdd52f78d5df1fc9dc0101ac0ba6893149c9ed31b6a14d73898efa35a7ecbb0ddf330f82fcf56ab52e9c4a49bd66f444d7615f8a7f5f1eac81414c671098
 AUX aboot.conf 295 SHA256 41372b883807cbd871a5c8f17c4787273f2107ba10be127f73ca9e445ce72ebd SHA512 2dc56371223f6dfa19d13feaa9e33655997f571309ba9158e265051b5b9fe3e2f79ccf66385bde8433cf8b5cd0cb95b3036de43f93392c31a95638039f658e30 WHIRLPOOL f1f9d7ca909c7adaa8a1a7a98219763cde16f619abb5f117a837f8aab389a683e33fdd9e308df4bfc4ff78813156ba089349697668104f4161461b8af015dc53
 DIST aboot-1.0_pre20040408.tar.bz2 115062 SHA256 a8ae8f2bf549c1cc79ea66a0a11c8db5c0257ce0d94b97418eb1c658723b12d2 SHA512 b1fff7ce806336f89efe8239108a8547053f22727cba93cea742995432c4f35133f8dc619588390ba6e0d114e2fd62b80b730443e6c18900aa2a8832ddd4ebfc WHIRLPOOL 74d6d72c0d6802682b10fb9a6505b95365ce5b784c0a2377d922604467129a6812f6ab00d579d511d93e3c40ba40627ad7f2f49eb6e08a0de10f7549aa09997e
 DIST aboot_gentoo.diff.bz2 9527 SHA256 6b141b7c90560d07ad740cfb8660a26935acfa96376e73439271d1fa9c6d0730 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f WHIRLPOOL b621387b6a6d04db8e2d1c3554c6615c782d783c9f42f854160e40ec1a2969ba1e5cff4be72e631379f485d5d0780f5dee87e81c67a1c313480bcf0b0d261937
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 SHA256 da57d0d8d12a59b05f0d3851e6d2f67c413baece046f4ec03831aa70df88710a SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d WHIRLPOOL cf35281fc5558c14a134bd4018e70a8cca589972c90980786669892a23aff4b1236f0c69586dfad4836bcdac7b75c5a902e15b88cc835adbcff16bbb5ded7181
-EBUILD aboot-1.0_pre20040408-r3.ebuild 2498 SHA256 9e623b875cfb0ea00710d6740c9b780c5f071e333eda169ee5a4c4b3d94d9e64 SHA512 9e129427a16ff0260e86887bfba3b7b8858572bc978acb0a1e588fe9039771e23d1724ef294134c9836f5be11d63b924c75d285e80f27d8775812e1bf4cf1446 WHIRLPOOL 606bbf85a01148cb32a438d973c1768a113f08462288ca7a0bc7539071524ca0182f222338ff16325fadcc13f388c369fbf2a9fc08e7ac033409d03a714a9ac1
+EBUILD aboot-1.0_pre20040408-r3.ebuild 2658 SHA256 4cd4d67605ac13be6c0f50505c319aefb7e48b3cc453050c92c2c02c75f11cde SHA512 9098f75eca2eff3bfea14808367fd2657a60e7bf02c2e8beb45da3bc7af966f03fda9575e376bea2fd31698ac7cf011ad40893fbbcf00a9f2d32c71b4e28e549 WHIRLPOOL 7d7ac7d58f20458a66416de754e6af5d20bf02a0c2d8e2bdfbbcd0c335affcc9c8ec3526ffbff67c083ed5f9959916664de1a0e9598c0b52b2b8c70f4c0fc2ba
 MISC ChangeLog 3159 SHA256 e70a31951e7d67c38528b57bfea930c6e23e92cf5dc93a8431e75e050d82df1a SHA512 fda7ddba86eaf9d19c776583c7a8ef8dca19b7247bde7ccdb7d18f7a24f8cd55108df9ddbc9ca619b62bb810af31ba2fe9a206af25473bbb123cf856f53c8402 WHIRLPOOL 66d0f207a6e3468ebec8f737583dea5429c93fdc1179ffba006e9758f46713fad3e021f5eb3c5cc0acb4d69c253c9c8ec0c20d073a58d4b1cb8908fc0f365bdd
 MISC ChangeLog-2015 3427 SHA256 fa51abbcb5b7563a23e2c2701e0aebded0d48fb33317c07590c7c52ae7b185df SHA512 d49bb6daabf4ba3fd3059b8ca6e034068169e7bb57ad56abf7867431ecac73b57e081ab1fb43ed943d23b9e8dfc1ee2835133b7f5636ddbde66f152f400f4bb0 WHIRLPOOL bc084937f3825018590ffdfca87fc72f7c8237f1ce7daa3474e7dc2e1fb7f543ffcc95e3f826ca1545645c389202b1af71b92331ab8bacab93d29a5b514cebd3
 MISC metadata.xml 338 SHA256 d2ffec8c65393ef6c8498f6c5ef174726de59289d3a02da2604bf95795e97e6b SHA512 2c9c87a850f9900d030fd37a4f59308136f478db254fbfd8e37d4f3c16ab33c74d1ef4119b74f4e0b34310ef066ffb53f89e2a4013cfca4a7b56f690e2aa7faf WHIRLPOOL 9be9da3ec0b475e9660be666228fb88b29e80b45d95c0c58d146ac382bdb98d65498a27518bb9bc7e67e54d9d25858810025554d35dee47e5f3c1941280d50a9
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index 9fcd14b1d0ff..2fd4afa8a92a 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 KERN_VER="2.6.22"
 
@@ -33,14 +33,18 @@ src_unpack() {
 	epatch "${FILESDIR}/aboot-pt_note.patch"
 	# Bug 364697
 	epatch "${FILESDIR}/aboot-define_stat_only_in_userspace.patch"
+	epatch "${FILESDIR}"/aboot-respect-AR.patch
+	epatch "${FILESDIR}"/aboot-gnu90.patch
 
 	# Modified patch from Debian to add netboot support
 	epatch "${WORKDIR}"/aboot_gentoo.diff
+
+	epatch_user
 }
 
 src_compile() {
 	# too many problems with parallel building
-	emake -j1 || die "emake failed"
+	emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) || die "emake failed"
 }
 
 src_install() {
diff --git a/sys-boot/aboot/files/aboot-gnu90.patch b/sys-boot/aboot/files/aboot-gnu90.patch
new file mode 100644
index 000000000000..2fb4b87f6b2c
--- /dev/null
+++ b/sys-boot/aboot/files/aboot-gnu90.patch
@@ -0,0 +1,26 @@
+This patch fixes multiple definitions of 'extern inline' functions.
+
+c99 and gnu90 have slightly different semantics
+WRT symbol definition: http://www.greenend.org.uk/rjk/tech/inline.html
+
+gcc-4 defaults to gnu90 and works, gcc-6 defaults to gnu-99
+and fails to link aboot as:
+  alpha-unknown-linux-gnu-ld: Disabling relaxation: it will not work with multiple definitions
+  lib/libaboot.a(isolib.o): In function `prefetchw':
+  (.text+0x60): multiple definition of `prefetchw'
+  fs/ext2.o:(.text+0xe68): first defined here
+
+The change is to force gnu90 explicitly.
+diff --git a/Makefile b/Makefile
+index b4245af..634ac87 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,6 @@ ifeq ($(TESTING),)
+ CPPFLAGS       = $(CFGDEFS) -I$(TOP)/include -I$(KSRC)/include
+-CFLAGS         = $(CPPFLAGS) -D__KERNEL__ -Os -Wall -fno-builtin -mno-fp-regs
++CFLAGS         = $(CPPFLAGS) -std=gnu90 -D__KERNEL__ -Os -Wall -fno-builtin -mno-fp-regs
+ else
+ CPPFLAGS       = -DTESTING $(CFGDEFS) -I$(TOP)/include -I$(KSRC)/include
+-CFLAGS		= $(CPPFLAGS) -O -g3 -Wall -D__KERNEL__ -ffixed-8
++CFLAGS		= $(CPPFLAGS) -std=gnu90 -O -g3 -Wall -D__KERNEL__ -ffixed-8
+ endif
diff --git a/sys-boot/aboot/files/aboot-respect-AR.patch b/sys-boot/aboot/files/aboot-respect-AR.patch
new file mode 100644
index 000000000000..44e4a2a52063
--- /dev/null
+++ b/sys-boot/aboot/files/aboot-respect-AR.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index e3a2247..c137b53 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -13,6 +13,6 @@ libaboot.a: vsprintf.o memcpy.o memset.o string.o _setjmp.o \
+ 	__remlu.o
+-	ar cru $@ $?
++	$(AR) cru $@ $?
+ else
+ libaboot.a: isolib.o
+-	ar cru $@ $?
++	$(AR) cru $@ $?
+ endif