svn commit: r407167 - in head/emulators/simh: . files

[Dimitry Andric]

Author: dim (src committer)
Date: Sun Jan 24 16:25:26 2016
New Revision: 407167
URL: https://svnweb.freebsd.org/changeset/ports/407167

Log:
  During the exp-run in bug 206074, it was found that emulators/simh gives
  errors with a recent clang 3.8.0 snapshot [1]:
  
     /usr/bin/ld: unrecognized option '-plugin'
  
  And more of such linking errors.  This is because the simh main Makefile
  attempts to use -flto -fwhole-program with clang, but this support
  depends on the correctly link time optimization infrastructure being
  installed (e.g. the LLVMgold.so plugin, and more).
  
  Since LTO is not available yet in base, here is a patch to disable the
  use of these options more thorougly.
  
  Approved by:	koobs (ports)
  PR:		206411
  MFH:		2016Q1

Added:
  head/emulators/simh/files/patch-makefile   (contents, props changed)
Modified:
  head/emulators/simh/Makefile

Modified: head/emulators/simh/Makefile
==============================================================================
--- head/emulators/simh/Makefile	Sun Jan 24 16:21:56 2016	(r407166)
+++ head/emulators/simh/Makefile	Sun Jan 24 16:25:26 2016	(r407167)
@@ -13,7 +13,7 @@ COMMENT=	Emulates classic DEC, HP, GRI, 
 NO_WRKSUBDIR=	yes
 
 USES=		gmake dos2unix zip
-DOS2UNIX_FILES=	VAX/vax_sysdev.c
+DOS2UNIX_FILES=	makefile VAX/vax_sysdev.c
 MAKE_ENV=	GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1
 MAKEFILE=	makefile
 

Added: head/emulators/simh/files/patch-makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/simh/files/patch-makefile	Sun Jan 24 16:25:26 2016	(r407167)
@@ -0,0 +1,15 @@
+--- makefile.orig	2012-04-23 16:28:04.000000000 +0200
++++ makefile	2016-01-19 20:21:21.371550000 +0100
+@@ -332,8 +332,10 @@
+   endif
+   ifeq (,$(NO_LTO))
+     ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS)))
+-      CFLAGS_O += -flto -fwhole-program
+-      LDFLAGS_O += -flto -fwhole-program
++      ifneq (,$(findstring -fwhole-program,$(GCC_OPTIMIZERS)))
++        CFLAGS_O += -flto -fwhole-program
++        LDFLAGS_O += -flto -fwhole-program
++      endif
+     endif
+   endif
+   BUILD_FEATURES = - compiler optimizations and no debugging support