sys-freebsd/freebsd-{lib,libexec}: Fixed bug 573358.

4 files changed, 6 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 97d9a78..d0b4aa3 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -34,5 +34,5 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
 DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
-EBUILD freebsd-lib-10.3_rc3.ebuild 19251 SHA256 608ec95b1ab504d36ccc6e7efcfbb83ae05d1d1d98b8578d8e1dfbf123a7087b SHA512 de24e4651beece8cb3b90e653f887a6d76c93235bb622983d5f028e5c760d7ce7820668e11a2b2125c0feaa7d87c3c4953822c3845396540332ddebd8d92cf9f WHIRLPOOL 37c5f303d4d5075d81284901d504b7dced4a9c098afd7d2c374fd604e2acba13e902e02d86f512bcae73717ac4d14a59b8c65f87ce81dbeb06372f075a9524cc
+EBUILD freebsd-lib-10.3_rc3.ebuild 19393 SHA256 e64ca01cb38f201de96b17a644208e5ba2a62c7540351c392614eca5523278e0 SHA512 b38f581b6a5d622205c03eda9aa62ad1659ba286a4fde71b8f65ce063a553e26898ef4230a48a318678091ddf88c62c40721a25e58cde611505144cdcb2c17ec WHIRLPOOL 47085900c6eac319a07477dc237aba7dbd0c8470ddaeb4814376cf03ba5d98df5c03378e2aeb951de8ca99ba9a142fba655100cfc389633316d30ea7a5f85845
 MISC metadata.xml 500 SHA256 82c704031ba7ec4dec7348c15d1188fad5e9df804c12f90c04afcb0a46eb5dd6 SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470 WHIRLPOOL 0837f442d3673e9bac470774a9868ad4992056a4edae8e07759248ec58830cb1a596cf39b347d04a3e33b16d88329084571df30f33bdc9c9e73073f32ca015ae
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild
index 20634bf..d657ddb 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild
@@ -144,6 +144,9 @@ is_crosscompile() {
 }
 
 src_prepare() {
+	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
+	use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
+
 	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
 
 	# Upstream Display Managers default to using VT7
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 7c1b4e6..41f1382 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -12,5 +12,5 @@ AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991
 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
 AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
 DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
-EBUILD freebsd-libexec-10.3_rc3.ebuild 3291 SHA256 e0851e239479ecdc812197f3f73e6d95db20ee3eb6080a12e91f7afafe4a9134 SHA512 ced93d79465235a9e30d9ddb90fe356a383bf6512ff6fae791d098aa2bb5c40711c193c9647ca762b3103ee8612dea1d9c6caa6e10c16fd02d69e54bbfecd28a WHIRLPOOL c98fe3c68604642d73fd47fd5ca9732c13282b46aa3cd83e18f9a30f4964f2e7539f8dfdc6c836277d0a55010caae8563ea48b66f7924d25fcd5b0a18ce8fcd2
+EBUILD freebsd-libexec-10.3_rc3.ebuild 3287 SHA256 cb0195c14c67be387e539c112021db2cf7dc8d274932a718a08e20be78205fbe SHA512 6b862c6633f7664821e3fe18e1ac996b296a1bb27b8b8558ce96834431fbe3e1f59808df5f80ac873205a7b9cb07afbe87e506c3e6b293551caddaf229367b6c WHIRLPOOL 4438e12877b355d35011cbb45c8cb076e05b2c8069e64f901a1345144cb77640ff8bab729cc818605243b1dc5dadff5c1c918a26f5bcdb25f3f3864f6821f43d
 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild
index a8008a3..84eb839 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild
@@ -54,7 +54,7 @@ pkg_setup() {
 
 src_prepare() {
 	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O[2-9] -O1
+	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
 
 	if [[ ! -e "${WORKDIR}/include" ]]; then
 		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."