Drop support for ssp found in gcc-3 and older #527974.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 28 insertions, 91 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 731ca6003b2d..3de0087c45d4 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.50 2015/05/17 04:25:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.51 2015/05/17 04:27:34 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org> -files/yaboot-nopiessp.patch,
+  yaboot-1.3.14-r2.ebuild, yaboot-1.3.16.ebuild, yaboot-1.3.17-r2.ebuild:
+  Drop support for ssp found in gcc-3 and older #527974.
 
   17 May 2015; Mike Frysinger <vapier@gentoo.org> yaboot-1.3.14-r2.ebuild,
   yaboot-1.3.16.ebuild, yaboot-1.3.17-r2.ebuild:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 18ee441e2b62..97bd3f6f7bdf 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -8,31 +8,30 @@ AUX sysfs-ofpath.patch 3432 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e
 AUX yaboot-1.3.16-memalign.patch 889 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c WHIRLPOOL 94606fabdbcb854141642e2bb7c6a5b7d0a571dedc489b22b3de658bd2c3e74118cdfbb44f100faaacb48b34b7162fd4313e8f66d3b389efff317b1f93b693ac
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d SHA512 30020247039f29e78799b5fa3e2054510294d266feb2014e02c3129dfccf67e7a9da3f565b1b3b9bcebb81d359dd15bc45fdec5f3fa37d15e913fb634409324b WHIRLPOOL 6c871e84e5f29bab65d29c2a355be9e88795330f8ea921e8ac1bfce6909dc30fc8b99b81306143937c14c256f042a371f4b2558b73fd540a4741dd0a676534ac
 AUX yaboot-nopiessp-gcc4.patch 1623 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1 SHA512 02e44f87a4c82bd218ba3e51cd76fe08b47552251193e9da8c39fe79b736387e7deceb4b4687b28924271e6f673cec1050084cfd85fde365c61ecd3a81eead77 WHIRLPOOL dc26c7135091deaf1779b1e45853e7ef869f3d44cf978ac9e331da57254ada63abc3932f1d948732035ef2e7e59bcf9ed33bc0a818e67b046c1f07facf3f22e9
-AUX yaboot-nopiessp.patch 1885 SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab SHA512 b2cf36b27e8487c99fecef9c609fe192f6067ff935ef7006ba94c0d5aae165dc796c19604513d38b77ee7bf06950ecd7828e751811e94d4eb528e3b1f5bf18d3 WHIRLPOOL 4b2e5abb584d15b89c2a4f54c59afa3e49e0cf5ea2730306297918db50a7bb67f10b8f499c4328aa668e3076c50ce8430c2252da153159eedf66e89a0bedeaaf
 AUX yaboot-stubfuncs.patch 3803 SHA256 58af65c19cb6f464bc32eaae1266eebbe1ff0a27857a984edc725a036c7ceecc SHA512 43e4adf2cb788e70b9245449cb4e116bf8511c6cfb66a22ab580f184bd9daaa7e79b96b442b119a0e8a6d1c8404dd69caa5a158153902c670723823ab1811bf1 WHIRLPOOL 44ae7403c0d88f98b76c3b887ddc8d694c615e85527907feb30afb1d7f4f2c7b7b566d31f4fce16b2893c373d3888a9e9abd93ca569b521031d55e3fafc56705
 AUX yabootconfig-1.3.13.patch 1655 SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20 SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98 WHIRLPOOL 28fb906a0de9bab0d383de289d25ab5be5941c1be51d2348f2c4bd12ee7c6259785eb948b5239be5d19a0c32c3962f05cfa7bad52fad1b889dfa09ea2633f5cd
 DIST yaboot-1.3.14.tar.gz 219089 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74 WHIRLPOOL 5eb364684b5628ea241719f2ac8c18ef2ee3daa7355da91fc69992187c01b1decce95144eb0d7cbd3a481124a3ff81880261b8e5e5aedf6f87499c3c3c95940c
 DIST yaboot-1.3.16.tar.gz 220360 SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650 SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14 WHIRLPOOL 5cd42ff0c041135c53cdd852ca227aba75e154cd557fdc6a740218982f5033da6f4428bda5934b6227dd726f31d2d97e2c37d3706076ecad77969678fe7c8eb4
 DIST yaboot-1.3.17.tar.gz 224325 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de WHIRLPOOL 8440faadd955aae0484a2d05c4b712d40b9f438224bbf26b2cf9e178944a007aeac779ae7a9ef2431f2404b24440930d34a63b36f46d8c58d4b7ce98af5c92bc
-EBUILD yaboot-1.3.14-r2.ebuild 1322 SHA256 25746d135981347cfd0161a04477c57b7e6cc89068dadb3777968c13094d0a2d SHA512 feb44835b3bb37424c928839c7b352e2144c96b75a40ade9ed9e9cf568cfcd0abeb67e0707582f95862534678b1b3f04f56ba1f2bf3dc9a4c7d9dec92d5a6c26 WHIRLPOOL be96e6ac66b96a5b9a019ab8e2e120cdb205a7219c820f2b45472bef06c34806e452f33b8227f49b3d838da719b76b102a24e0b26267942441248c3494898d1c
-EBUILD yaboot-1.3.16.ebuild 1487 SHA256 7d064f10cbc0b5ac8e76adb4eee86471b7da0355428799c09401592e0f690eec SHA512 307a69596843ebd401ac31e0f584ef1307dfb44acb5d997da8ed1ebd53c8be7e236c4076a3eb9e20b87d473c3f07d60bc27c73a25c83b135b48a92a56806d9a4 WHIRLPOOL 4fd4d42ab00194b87b2b5d527d995c2336597c644dd6dbb29ba4730552ad44cb4aecf97f042283e887573b5cc1a888704d93944d72a470e92130763033184ce3
-EBUILD yaboot-1.3.17-r2.ebuild 1758 SHA256 e81610762583d40ab6d53e200bb0bbddc23b7ba95102c7c6cc5b12972f239c45 SHA512 1aebc028acc44e84349e9347498a3a288713b44adecae0b0ec882b0d802ee6684eb1cb0fa2a7b40516d5a0ba65574884a94885728403d59131f9c8fc73535ce4 WHIRLPOOL 899d661135b390ac261b3212012b41d6a4955a8315e3f6e7fbc403a9017f69671297368d4a52c713bdbf925acbe4900d8fe026e8ba6c805489469e98935ccbda
-MISC ChangeLog 12076 SHA256 5f45fd8166f0ead264cec88f44325410764598f9de153a925dc85cfd7cb4b959 SHA512 ed9f302934d12bd118c28f6ce07eb76f13397140425afa42370f1919f477193801188c648cea6aed08b264c781aa21affb30eb22b6c91531ad89db41a3c041ff WHIRLPOOL d7feaa9bcb63a7a3ece652d6e4e8342e012e537b308026d577044540a1006de2949f293d3397165e1399bde2ce956250023a1b8131188149ea51e544e4ed944c
+EBUILD yaboot-1.3.14-r2.ebuild 1174 SHA256 f2adaa2089a4f9d092579e8c61cff2a447d7f829a37bb2a13c0496e2f10acc0c SHA512 2bd93d8d482bfb6eeb6ce109a6c13b5b8284a480edae5a517f1d44b812a4b595fa2627edc2d4354d28cf06b7c5be57910a43ae5c110d1b59e35b43adadeb08e0 WHIRLPOOL e85cafb141aa7a6522fea86a6d11f2c8711e8d6b7c8597890e7e1fee38d7aab9f028a9ded43f1b0c64e5734b301b70a0d5d4b3097f3a0b978ca66aed1fb97d4f
+EBUILD yaboot-1.3.16.ebuild 1339 SHA256 365c28de2517b29af608897c4fb24a1297bece03dabb270403dfebca2b2800dd SHA512 76c0205ae93d06cc00e69553fc38f574ea2b38303f2bea7363e68d79d6f96a6f0b76b3485f916003fd1e51fca5ea25c139e0017e727c461a103adbb5a1d28d06 WHIRLPOOL e4439409ba22bc3cd1c1d3e933ecc761c078ee05b57f4f97ef7b1ad19c05e7686cebbcdca0cc751595ea03eca9ecb9d379a9c245bf86b4894bd5b66aae6e735e
+EBUILD yaboot-1.3.17-r2.ebuild 1611 SHA256 42b1fab1ee0dacc278b6cd82444e1a6ab180764f3dfbd4535b3fd9677c30a754 SHA512 1b8e3023708a36b551552c107eac3a3672e3b2fd64dcc6aca23b1a53d57cfc3a2cdf36655d053fae4a8b94dd3a50de59ec2c7def92dbd506bd5f5f08da1fde82 WHIRLPOOL 97337984466cdda204e4aaffec3fdb1928b13efab3454cac57613bbb15d47f2d3dea1662af7902000ec92bf564a7e2ccdb3c2807090365c5e6429537e326f1d4
+MISC ChangeLog 12288 SHA256 24f59f5ad7151e51f924a5f3077695c30b5b7abb114d51ac2c6216e465eca64c SHA512 99f57f0d7f35ecfd637020440a240378c72438a02672e2eef1e432c30c7626377cb95df60a09dde04b3bce31fb8a836e7912e096ab9a69b74ee1a1facc8c4522 WHIRLPOOL fd7c81950788c5bb2df3df666d2a2c95f2473b1c9935121c7866d43219fdee4bcd6dc423528e26de9247d7f2bb701324e7637e894d88866156a7160610ccd1c2
 MISC metadata.xml 175 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a SHA512 9933194f53703c4f34f6b7145e9236acfa60669c9a036c2c9da309f1adec5f4addf508040b7be6b935dfc36ed652dd3b2cefc5e48bc48f0e01c9def0022ca7e2 WHIRLPOOL edb132936f3b6adc3944344b9e2b57de7a126febbc799869e3838933eebd307d02c99f3466aeaf2ebe7d3fd4c9cab66c56fbff0e8b02734314c20926b4a11e46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWBgpAAoJEPGu1DbS6WIAbnYP/RJ929GkxTWnm/+BDqYLsTMH
-bZAOj3jz4WSAoSvSfB9zvdljbdNSFyvjpXuXGB5MPLvNSOjth6jHFZ9Dsb75NXAN
-v7b6TDau2j3MEUIfVqGofztZmM3DixNOvB5Da9Jjcp6tr1nEPu/XeOGFa3ER214L
-107O7qiF7YJYkPUHPokay0aPazu6ErynoObqWKNVDHmsJ786yDRaSMKkCGH1pSUV
-CO7WWnjy4J62UUkZ4XRWg1wYsbily5X81GJFkBmNLMhK4/yiI/Beom8HofCdlEiW
-gjV8+Gki59UXKz4iNHic2oviSxTCrcciLPNKMdDFl+gK6jZFHAZNfavUXzemS5Vr
-5HZJMN/hGVCBrJ00/kixlv9brRMK2GGHaRmYlynxXF2SVP/wP3inx3rPXkEX+IZK
-/HWknoHVQ0CVxPpa6EvcrMOaulb1qqj2SqMH+QHOZneR3Ny8Gm3bNds+tu/A7lwj
-ZUhZH1oIZdUo2/U3hWaaHvVVM2ZrgAz3gKdhK5ZfJyePgzYIvjXH34z9+FVhTEYb
-TC7SOS/1xCrljshrmz2tRqLHhf821UMbuvnW2bZ6iUftJvMbQ9qya7Aa3mS7VTrb
-Ek+5ulHGTpm+0UeIpZt6I04yeLHA+oAaIzHEJ5rQr6CrxqxmuDGfYovxDfrHU4Qq
-UoamgdmAdCikiBW9NqP1
-=VE5S
+iQIcBAEBCAAGBQJVWBi4AAoJEPGu1DbS6WIAduIP/iSW6GGdBZGmkWxR4cv1D4Ya
+kiuO4aiBgIolcMjbLMBBR7hLPPSQas/MVqneNLtL8Mt/QKfd1gnetJur/7BzdiH7
+nMDhqMfIWNlrFcswp2EubBvUxhvmnPPKTWIfSA79plN7z5/shiG3SMklDBADuBfO
+XR5LtNz+q3/Q/dmNABCxoNy6ECKcYnmHjpaw2fDah3xzls2qShZOYnelA7W7GCg3
+ZGsq2H23EVNeRf4w/1jX2/pVpKNGRltN8G6vEWHUm/FfPsC4GyhONJg1TizR6ICG
+VEKgEsYnG8eJ3lUmX/JYl5yLoWOCKgmLqilY7KBkFIqiqf291h9lhDKH3rudOVou
+4NJRAGHGSq5kLKDUKXVtYlkJ5EM7CzvUBMoHYiLlLoPB8uBwCRupKo/zXTDniru9
+QIh68pTZRC98tv5cix6XOtPos3I3+e+nSal62kbUp/aOJblUkvq5cas/5pgsb2/l
+7R6MamiW/qWRPTv8VsTKziZFELMQUEqoqc2GIbkMnpNgEMm7gM0ah53LWv7TTqpu
+1KfQfE50R5HKgdczvvm7bM2PmK1dwbbitBzq7BgM6Cfg+zjnDmPq634d0ezmy2Zz
+3MGFcw4HmSMhQQyF1Wg2J1blCB7u6bTQLksvA+dBjqJCcLysh+Newq1UlU5ifuE5
+dK1OHB9/Deus0G2FyX4+
+=BZ1l
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp.patch b/sys-boot/yaboot/files/yaboot-nopiessp.patch
deleted file mode 100644
index 32e64392b730..000000000000
--- a/sys-boot/yaboot/files/yaboot-nopiessp.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
---- yaboot-1.3.13.orig/Config.gentoo	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/Config.gentoo	2005-06-12 00:41:14.889576152 +0000
-@@ -0,0 +1,6 @@
-+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-+	then echo "$(1)"; else echo "$(2)"; fi)
-+
-+CFLAGS     += $(call check_gcc, -fno-stack-protector)
-+CFLAGS     += $(call check_gcc, --nopie)
-+
-diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
---- yaboot-1.3.13.orig/Makefile	2004-07-11 20:12:03.000000000 +0000
-+++ yaboot-1.3.13/Makefile	2005-06-12 00:41:14.890576000 +0000
-@@ -1,6 +1,7 @@
- ## Setup
- 
- include Config
-+include Config.gentoo
- 
- VERSION = 1.3.13
- # Debug mode (spam/verbose)
-@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
- 	second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
--	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-+	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
- 
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
-diff -Nrup yaboot-1.3.13.orig/lib/ssp.c yaboot-1.3.13/lib/ssp.c
---- yaboot-1.3.13.orig/lib/ssp.c	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/lib/ssp.c	2005-06-12 00:42:17.087120688 +0000
-@@ -0,0 +1,17 @@
-+unsigned long __guard = 0UL;
-+static void __guard_setup (void) __attribute__ ((constructor));
-+void __stack_smash_handler (char func[], int damaged
-+			    __attribute__ ((unused)));
-+static void
-+__guard_setup (void)
-+{
-+  if (__guard != 0UL)
-+    return;
-+  __guard = 0xFF0A0D00UL;
-+}
-+
-+void
-+__stack_smash_handler (char func[], int damaged)
-+{
-+  return;
-+}
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
index e3c1320ac440..a4d702370c28 100644
--- a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild,v 1.10 2015/05/17 04:25:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild,v 1.11 2015/05/17 04:27:34 vapier Exp $
 
 EAPI="5"
 
@@ -32,12 +32,7 @@ src_prepare() {
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
-	if [[ "$(gcc-major-version)" -eq "3" ]]; then
-		epatch "${FILESDIR}/yaboot-nopiessp.patch"
-	fi
-	if [[ "$(gcc-major-version)" -eq "4" ]]; then
-		epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-	fi
+	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
 	epatch "${FILESDIR}/sysfs-ofpath.patch"
 }
 
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild
index 53e065b8cdd4..e19c96e8da08 100644
--- a/sys-boot/yaboot/yaboot-1.3.16.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.10 2015/05/17 04:25:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.11 2015/05/17 04:27:34 vapier Exp $
 
 EAPI="5"
 
@@ -38,12 +38,7 @@ src_prepare() {
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
-	if [[ "$(gcc-major-version)" -eq "3" ]]; then
-		epatch "${FILESDIR}/yaboot-nopiessp.patch"
-	fi
-	if [[ "$(gcc-major-version)" -eq "4" ]]; then
-		epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-	fi
+	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
 
 	# e2fsprogs memalign patch
 	epatch "${FILESDIR}/${P}-memalign.patch"
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
index 55c8883e29cd..ad93a575bbc7 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.7 2015/05/17 04:25:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.8 2015/05/17 04:27:34 vapier Exp $
 
 EAPI="5"
 
@@ -39,12 +39,7 @@ src_prepare() {
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
-	if [[ "$(gcc-major-version)" -eq "3" ]]; then
-		epatch "${FILESDIR}/${PN}-nopiessp.patch"
-	fi
-	if [[ "$(gcc-major-version)" -eq "4" ]]; then
-		epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-	fi
+	epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
 
 	# Error only on real errors, for prom printing format compile failure
 	sed -i "s:-Werror:-Wno-error:g" Makefile