CVS commit: pkgsrc/emulators/simh

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Feb 18 16:49:50 UTC 2020

Modified Files:
        pkgsrc/emulators/simh: distinfo
        pkgsrc/emulators/simh/patches: patch-makefile

Log Message:
Don't use LTO with clang on NetBSD, ld doesn't know about it.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/emulators/simh/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/simh/patches/patch-makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/simh/distinfo
diff -u pkgsrc/emulators/simh/distinfo:1.30 pkgsrc/emulators/simh/distinfo:1.31
--- pkgsrc/emulators/simh/distinfo:1.30 Mon Sep 24 14:12:28 2018
+++ pkgsrc/emulators/simh/distinfo      Tue Feb 18 16:49:50 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2018/09/24 14:12:28 gson Exp $
+$NetBSD: distinfo,v 1.31 2020/02/18 16:49:50 joerg Exp $
 
 SHA1 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 58d77b58be3850d5f1cd9a7cdcb24d1e110bd71e
 RMD160 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 0b2ad6107006f89b0ca66ddc556c2f00df56937c
 SHA512 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 1c17430e74022cb5a9aebc784dc1a223fbbe323799ab528a9c788db8e3dbad01b7635da3c3dc158fcd28103c5fc462ce0fc3e9cdd90c298ff6ecdeb3dfd5f0a8
 Size (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 12077046 bytes
-SHA1 (patch-makefile) = ed0f4fdcb63d09e7f0374abafc3f8d03f0f86e91
+SHA1 (patch-makefile) = 6e07d6fb406a455a93447facfc93c79da7de74a6
 SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790

Index: pkgsrc/emulators/simh/patches/patch-makefile
diff -u pkgsrc/emulators/simh/patches/patch-makefile:1.2 pkgsrc/emulators/simh/patches/patch-makefile:1.3
--- pkgsrc/emulators/simh/patches/patch-makefile:1.2    Mon Sep 24 14:12:28 2018
+++ pkgsrc/emulators/simh/patches/patch-makefile        Tue Feb 18 16:49:50 2020
@@ -1,11 +1,12 @@
-$NetBSD: patch-makefile,v 1.2 2018/09/24 14:12:28 gson Exp $
+$NetBSD: patch-makefile,v 1.3 2020/02/18 16:49:50 joerg Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
+Exclude -flto for clang on NetBSD
 Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
 Make -O2 conditional so can be overridden by environment
 Fix SDL2 detection
 
---- makefile.orig      2018-09-20 05:36:48.000000000 +0000
+--- makefile.orig      2018-09-20 05:36:48.-00145232 +0000
 +++ makefile
 @@ -217,7 +217,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
        $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
@@ -16,7 +17,7 @@ Fix SDL2 detection
    PCAPLIB = pcap
    ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
      OS_CCDEFS = -D_GNU_SOURCE
-@@ -1039,11 +1039,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
+@@ -1039,20 +1039,23 @@ ifneq (,$(UNSUPPORTED_BUILD))
  endif
  ifneq ($(DEBUG),)
    CFLAGS_G = -g -ggdb -g3
@@ -29,8 +30,12 @@ Fix SDL2 detection
 +    CFLAGS_O ?= -O0
      ifeq (Darwin,$(OSTYPE))
        NO_LTO = 1
++    endif
++    ifeq (NetBSD,$(OSTYPE))
++      NO_LTO = 1
      endif
-@@ -1052,7 +1052,7 @@ else
+   else
+     NO_LTO = 1
      ifeq (Darwin,$(OSTYPE))
        CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
      else