From 3a5e3abcccd974005885f0cb070a5914fec19dc3 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 3 May 2016 08:26:43 +0000
Subject: Fix build with gcc 5.3.0.

To quote abs:
I don't know why this package has a manually maintained list of gcc versions
to exclude LTO on, but for now just add 4.8.5. Fixed build on netbsd-7
No PKGREVISION bump as will only affect platforms which did not build before
---
 emulators/simh/distinfo         | 4 ++--
 emulators/simh/patches/patch-aa | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'emulators')

diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index d34b345444e..b4e0ec278da 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.24 2016/01/12 12:51:19 abs Exp $
+$NetBSD: distinfo,v 1.25 2016/05/03 08:26:43 wiz Exp $
 
 SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb
 RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050
 SHA512 (simhv39-0.zip) = 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6
 Size (simhv39-0.zip) = 3103657 bytes
-SHA1 (patch-aa) = 96d323402f4d5850340b979587046e346014f9d0
+SHA1 (patch-aa) = a1c90dca4747f8535c5544dc7c11ff70613196fc
 SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de
 SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3
 SHA1 (patch-sim__timer.h) = 1ee43b9a6586cdeb0f4dd22321957de8d30d3376
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index f9468a3f2b4..39ee45837e8 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.14 2016/01/12 12:51:19 abs Exp $
+$NetBSD: patch-aa,v 1.15 2016/05/03 08:26:43 wiz Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
 Make -O2 conditional so can be overridden by environment
 
---- makefile.orig	2012-06-13 16:46:32.000000000 +0000
+--- makefile.orig	2012-04-23 16:28:04.000000000 +0000
 +++ makefile
 @@ -63,7 +63,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
      OSNAME = windows-build
    endif
    GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }')
 -  LTO_EXCLUDE_VERSIONS = 
-+  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5
++  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0
    PCAPLIB = pcap
    ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
      OS_CCDEFS = -D_GNU_SOURCE
-- 
cgit v1.2.3