Tue Jan 12 12:51:19 2016 UTC ()
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


(abs)
diff -r1.23 -r1.24 pkgsrc/emulators/simh/distinfo
diff -r1.13 -r1.14 pkgsrc/emulators/simh/patches/patch-aa
cvs diff -r1.23 -r1.24 pkgsrc/emulators/simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simh/distinfo 2015/11/03 20:31:01 1.23
+++ pkgsrc/emulators/simh/distinfo 2016/01/12 12:51:19 1.24
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.23 2015/11/03 20:31:01 agc Exp $ 1$NetBSD: distinfo,v 1.24 2016/01/12 12:51:19 abs Exp $
2 2
3SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb 3SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb
4RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050 4RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050
5SHA512 (simhv39-0.zip) = 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6 5SHA512 (simhv39-0.zip) = 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6
6Size (simhv39-0.zip) = 3103657 bytes 6Size (simhv39-0.zip) = 3103657 bytes
7SHA1 (patch-aa) = 88e2b2ba2b131c1c3ce440b47a8538c45dc09024 7SHA1 (patch-aa) = 96d323402f4d5850340b979587046e346014f9d0
8SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de 8SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de
9SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3 9SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3
10SHA1 (patch-sim__timer.h) = 1ee43b9a6586cdeb0f4dd22321957de8d30d3376 10SHA1 (patch-sim__timer.h) = 1ee43b9a6586cdeb0f4dd22321957de8d30d3376
cvs diff -r1.13 -r1.14 pkgsrc/emulators/simh/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/simh/patches/Attic/patch-aa 2014/11/20 23:48:12 1.13
+++ pkgsrc/emulators/simh/patches/Attic/patch-aa 2016/01/12 12:51:19 1.14
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-aa,v 1.13 2014/11/20 23:48:12 jklos Exp $ 1$NetBSD: patch-aa,v 1.14 2016/01/12 12:51:19 abs Exp $
2 2
3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6) 3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
4Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1) 4Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
5Make -O2 conditional so can be overridden by environment 5Make -O2 conditional so can be overridden by environment
6 6
7--- makefile.orig 2012-06-13 16:46:32.000000000 +0000 7--- makefile.orig 2012-06-13 16:46:32.000000000 +0000
8+++ makefile 8+++ makefile
9@@ -63,7 +63,7 @@ ifeq ($(WIN32),) #*nix Environments (&& 9@@ -63,7 +63,7 @@ ifeq ($(WIN32),) #*nix Environments (&&
10 OSNAME = windows-build 10 OSNAME = windows-build
11 endif 11 endif
12 GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }') 12 GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }')
13- LTO_EXCLUDE_VERSIONS =  13- LTO_EXCLUDE_VERSIONS =
14+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 14+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5
15 PCAPLIB = pcap 15 PCAPLIB = pcap
16 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build? 16 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
17 OS_CCDEFS = -D_GNU_SOURCE 17 OS_CCDEFS = -D_GNU_SOURCE
18@@ -300,7 +300,7 @@ ifneq ($(DEBUG),) 18@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
19 CFLAGS_O = -O0 19 CFLAGS_O = -O0
20 BUILD_FEATURES = - debugging support 20 BUILD_FEATURES = - debugging support
21 else 21 else
22- CFLAGS_O = -O2 22- CFLAGS_O = -O2
23+ CFLAGS_O ?= -O2 23+ CFLAGS_O ?= -O2
24 LDFLAGS_O =  24 LDFLAGS_O =
25 GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION))) 25 GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION)))
26 ifneq (3,$(GCC_MAJOR_VERSION)) 26 ifneq (3,$(GCC_MAJOR_VERSION))