[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / emulators / simh / patches

File: [cvs.NetBSD.org] / pkgsrc / emulators / simh / patches / Attic / patch-aa (download)

Revision 1.15, Tue May 3 08:26:43 2016 UTC (7 years, 10 months ago) by wiz
Branch: MAIN
Changes since 1.14: +3 -3 lines

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

$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-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 5.3.0
   PCAPLIB = pcap
   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
     OS_CCDEFS = -D_GNU_SOURCE
@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
   CFLAGS_O = -O0
   BUILD_FEATURES = - debugging support
 else
-  CFLAGS_O = -O2
+  CFLAGS_O ?= -O2
   LDFLAGS_O = 
   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
   ifneq (3,$(GCC_MAJOR_VERSION))