head	1.5;
access;
symbols
	pkgsrc-2026Q1:1.5.0.10
	pkgsrc-2026Q1-base:1.5
	pkgsrc-2025Q4:1.5.0.8
	pkgsrc-2025Q4-base:1.5
	pkgsrc-2025Q3:1.5.0.6
	pkgsrc-2025Q3-base:1.5
	pkgsrc-2025Q2:1.5.0.4
	pkgsrc-2025Q2-base:1.5
	pkgsrc-2025Q1:1.5.0.2
	pkgsrc-2025Q1-base:1.5
	pkgsrc-2024Q4:1.4.0.2
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.3.0.10
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.8
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.6
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.4
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.2
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.2.0.6
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.4
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.2
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.1.0.4
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.2
	pkgsrc-2022Q2-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2025.03.03.14.34.01;	author jakllsch;	state Exp;
branches;
next	1.4;
commitid	QpmC3eJ0q9wI8DLF;

1.4
date	2024.10.03.12.42.53;	author rhialto;	state Exp;
branches;
next	1.3;
commitid	tEWbEU72g4hAndsF;

1.3
date	2023.07.23.15.44.25;	author rhialto;	state Exp;
branches;
next	1.2;
commitid	EXhXiJhVFEBHsWxE;

1.2
date	2022.12.11.20.28.09;	author rhialto;	state Exp;
branches;
next	1.1;
commitid	KbBkaQFzuePmeb5E;

1.1
date	2022.06.06.14.20.07;	author rhialto;	state Exp;
branches;
next	;
commitid	QW6AdEK5uk9UeZGD;


desc
@@


1.5
log
@Fix open-simh networking on Linux
@
text
@$NetBSD: patch-makefile,v 1.4 2024/10/03 12:42:53 rhialto Exp $

Fix png16 detection.
Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH,
to avoid seeing non-pkgsrc libraries (except MacOS platform).

--- makefile.orig	2025-01-17 21:35:53.000000000 +0000
+++ makefile
@@@@ -404,16 +404,16 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
     ifeq (Darwin,$(OSTYPE))
       OSNAME = OSX
       LIBEXT = dylib
-      ifneq (include,$(findstring include,$(UNSUPPORTED_BUILD)))
-        INCPATH:=$(shell LANG=C; ${GCC} -x c -v -E /dev/null 2>&1 | grep -A 10 '> search starts here' | grep '^ ' | grep -v 'framework directory' | tr -d '\n')
-      endif
+      #ifneq (include,$(findstring include,$(UNSUPPORTED_BUILD)))
+        INCPATH+=$(shell LANG=C; ${GCC} -x c -v -E /dev/null 2>&1 | grep -A 10 '> search starts here' | grep '^ ' | grep -v 'framework directory' | tr -d '\n')
+      #endif
       ifeq (incopt,$(shell if ${TEST} -d /opt/local/include; then echo incopt; fi))
-        INCPATH += /opt/local/include
-        OS_CCDEFS += -I/opt/local/include
+        # INCPATH += /opt/local/include
+        # OS_CCDEFS += -I/opt/local/include
       endif
       ifeq (libopt,$(shell if ${TEST} -d /opt/local/lib; then echo libopt; fi))
-        LIBPATH += /opt/local/lib
-        OS_LDFLAGS += -L/opt/local/lib
+        # LIBPATH += /opt/local/lib
+        # OS_LDFLAGS += -L/opt/local/lib
       endif
       ifeq (HomeBrew,$(or $(shell if ${TEST} -d /usr/local/Cellar; then echo HomeBrew; fi),$(shell if ${TEST} -d /opt/homebrew/Cellar; then echo HomeBrew; fi)))
         ifeq (local,$(shell if $(TEST) -d /usr/local/Cellar; then echo local; fi))
@@@@ -421,8 +421,8 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
         else
           HBPATH = /opt/homebrew
         endif
-        INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/include))
-        LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/lib))
+        # INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/include))
+        # LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/lib))
       endif
     else
       ifeq (Linux,$(OSTYPE))
@@@@ -432,15 +432,15 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
         ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
           ifeq (Android,$(shell uname -o))
             ifneq (,$(shell if ${TEST} -d ${PREFIX}/lib; then echo prefixlib; fi))
-              LIBPATH += ${PREFIX}/lib
+              # LIBPATH += ${PREFIX}/lib
             endif
             ifneq (,$(shell if ${TEST} -d /system/lib; then echo systemlib; fi))
-              LIBPATH += /system/lib
+              # LIBPATH += /system/lib
             endif
-            LIBPATH += $(LD_LIBRARY_PATH)
+            # LIBPATH += $(LD_LIBRARY_PATH)
           endif
           ifeq (ldconfig,$(shell if ${TEST} -e /sbin/ldconfig; then echo ldconfig; fi))
-            LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
+            # LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
           endif
         endif
         LIBSOEXT = so
@@@@ -449,7 +449,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
         ifeq (SunOS,$(OSTYPE))
           OSNAME = Solaris
           ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
-            LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
+            # LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
           endif
           LIBEXT = so
           OS_LDFLAGS += -lsocket -lnsl
@@@@ -458,27 +458,27 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
             OS_CCDEFS += -I/opt/sfw/include
           endif
           ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))
-            LIBPATH += /opt/sfw/lib
-            OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
+            # LIBPATH += /opt/sfw/lib
+            # OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
           endif
           OS_CCDEFS += -D_LARGEFILE_SOURCE
         else
           ifeq (cygwin,$(OSTYPE))
             # use 0readme_ethernet.txt documented Windows pcap build components
-            INCPATH += ../windows-build/winpcap/WpdPack/Include
-            LIBPATH += ../windows-build/winpcap/WpdPack/Lib
+            # INCPATH += ../windows-build/winpcap/WpdPack/Include
+            # LIBPATH += ../windows-build/winpcap/WpdPack/Lib
             PCAPLIB = wpcap
             LIBEXT = a
           else
             ifneq (,$(findstring AIX,$(OSTYPE)))
               OS_LDFLAGS += -lm -lrt
               ifeq (incopt,$(shell if ${TEST} -d /opt/freeware/include; then echo incopt; fi))
-                INCPATH += /opt/freeware/include
-                OS_CCDEFS += -I/opt/freeware/include
+                # INCPATH += /opt/freeware/include
+                # OS_CCDEFS += -I/opt/freeware/include
               endif
               ifeq (libopt,$(shell if ${TEST} -d /opt/freeware/lib; then echo libopt; fi))
-                LIBPATH += /opt/freeware/lib
-                OS_LDFLAGS += -L/opt/freeware/lib
+                # LIBPATH += /opt/freeware/lib
+                # OS_LDFLAGS += -L/opt/freeware/lib
               endif
             else
               ifneq (,$(findstring Haiku,$(OSTYPE)))
@@@@ -489,9 +489,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
                 ifeq ($(HAIKU_ARCH),x86_gcc2)
                   $(error Unsupported arch x86_gcc2. Run setarch x86 and retry)
                 endif
-                INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
-                INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
-                LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
+                # INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
+                # INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
+                # LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
                 OS_LDFLAGS += -lnetwork
               else
                 ifeq (,$(findstring NetBSD,$(OSTYPE)))
@@@@ -499,7 +499,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
                     LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
                   endif
                   ifneq (,$(LDSEARCH))
-                    LIBPATH := $(LDSEARCH)
+                    # LIBPATH := $(LDSEARCH)
                   else
                     ifeq (,$(strip $(LPATH)))
                       $(info *** Warning ***)
@@@@ -511,22 +511,22 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
                       $(info *** Warning *** variable.)
                       $(info *** Warning ***)
                     else
-                      LIBPATH = $(subst :, ,$(LPATH))
+                      # LIBPATH = $(subst :, ,$(LPATH))
                     endif
                   endif
-                  OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
+                  # OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
                 endif
               endif
             endif
             ifeq (usrpkglib,$(shell if ${TEST} -d /usr/pkg/lib; then echo usrpkglib; fi))
-              LIBPATH += /usr/pkg/lib
-              INCPATH += /usr/pkg/include
-              OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib
-              OS_CCDEFS += -I/usr/pkg/include
+              # LIBPATH += /usr/pkg/lib
+              # INCPATH += /usr/pkg/include
+              # OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib
+              # OS_CCDEFS += -I/usr/pkg/include
             endif
             ifeq (/usr/local/lib,$(findstring /usr/local/lib,${LIBPATH}))
-              INCPATH += /usr/local/include
-              OS_CCDEFS += -I/usr/local/include
+              # INCPATH += /usr/local/include
+              # OS_CCDEFS += -I/usr/local/include
             endif
             ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))
               LIBEXT = so
@@@@ -553,12 +553,12 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
     endif
     ifeq (,$(filter /lib/,$(LIBPATH)))
       ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))
-        LIBPATH += /lib/
+        # LIBPATH += /lib/
       endif
     endif
     ifeq (,$(filter /usr/lib/,$(LIBPATH)))
       ifeq (existusrlib,$(shell if $(TEST) -d /usr/lib/; then echo existusrlib; fi))
-        LIBPATH += /usr/lib/
+        # LIBPATH += /usr/lib/
       endif
     endif
     export CPATH = $(subst $() $(),:,$(INCPATH))
@@@@ -671,10 +671,10 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
     OS_CCDEFS += -DHAVE_UTIME
   endif
   ifneq (,$(call find_include,png))
-    ifneq (,$(call find_lib,png))
+    ifneq (,$(call find_lib,png16))
       OS_CCDEFS += -DHAVE_LIBPNG
-      OS_LDFLAGS += -lpng
-      $(info using libpng: $(call find_lib,png) $(call find_include,png))
+      OS_LDFLAGS += -lpng16
+      $(info using libpng: $(call find_lib,png16) $(call find_include,png))
     endif
   endif
   ifneq (,$(call find_include,zlib))
@@@@ -867,7 +867,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
             $(info *** Error *** Support for linking statically has been removed on the $(OSTYPE))
             $(info *** Error *** platform.)
             $(info *** Error ***)
-            $(error Retry your build without specifying USE_NETWORK=1)
+            #$(error Retry your build without specifying USE_NETWORK=1)
           endif
           ifeq (cygwin,$(OSTYPE))
             # cygwin has no ldconfig so explicitly specify pcap object library
@@@@ -922,7 +922,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
           NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}
           $(info using libpcap: $(call find_include,pcap))
         else
-          LIBPATH += /usr/local/lib
+          # LIBPATH += /usr/local/lib
           LIBEXT = a
           ifneq (,$(call find_lib,$(PCAPLIB)))
             $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
@@@@ -1322,15 +1322,15 @@@@ endif
 OPTIMIZE ?= -O2 -DNDEBUG=1
 ifneq ($(DEBUG),)
   CFLAGS_G = -g -ggdb -g3 -D_DEBUG=1
-  CFLAGS_O = -O0
+  CFLAGS_O += -O0
   BUILD_FEATURES = - debugging support
   LTO =
 else
   ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
-    CFLAGS_O = $(OPTIMIZE) -fno-strict-overflow
+    CFLAGS_O += $(OPTIMIZE) -fno-strict-overflow
     GCC_OPTIMIZERS_CMD = ${GCC} --help 2>&1
   else
-    CFLAGS_O := $(OPTIMIZE)
+    CFLAGS_O += $(OPTIMIZE)
   endif
   LDFLAGS_O =
   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
@


1.4
log
@emulators/open-simh: update to 2024 09 04.

Notable changes:

    AltairZ80: Adds "rom" option to "load -h"
    sigma: Update latest from Bob Supnik's v3.12-5
    PDP11: RP11: Implement original RP11 controller flavor
    VAX: Mask QBus addresses to 22 bits for ka630/ka65x
    Mask adapter channel from buffer address for QBus accesses
    Mask QBus addresses to 22 bits
    AltairZ80: Adds CUTER PROM to SOL20 device
    AltairZ80: Fix 8080 and Z80 CPU
    PDP11: Fix to fix disassembly #331
@
text
@d1 1
a1 1
$NetBSD: patch-makefile,v 1.3 2023/07/23 15:44:25 rhialto Exp $
d7 1
a7 1
--- makefile.orig	2024-09-05 21:21:41.000000000 +0000
d191 9
@


1.3
log
@emulators/open-simh: update to version 4.1.0.20230717

Fixes a crashing bug when attaching disk images to RQ (MSCP) devices.
Build and sanitizer fixes.
Further:
* cf47a20f DISK: add RQDX1 model and make it default for MV1.
* 0d47f7d3 AltairZ80: Updated documentation including format change
* 86ffe4be sim_disk.c: only free filebuf if it was allocated here too.
* f8a9f9bb AltairZ80: m68k: Avoid buffer overflow detected by gcc 9.4.0.
* 5b22fcf4 PDP11: RK11: Complete fix for WC as implemented in V3 + other fixes
* fcaf741d sigma: Correct DP Sense Length error(Bob Supnik)
* 3acc69fb AltairZ80: IBC MCC: Clean up HDC.
* b982fc99 TIMER: Properly report clock calibration inconsistency
* 96de0748 SCP: Don't malloc ep->match_pattern twice
* 76da2c0d 3B2: Properly NULL-terminate IU mod arrays
* ea5bcf97 Fix TODR example command
@
text
@d1 1
a1 1
$NetBSD: patch-makefile,v 1.2 2022/12/11 20:28:09 rhialto Exp $
d7 1
a7 1
--- makefile.orig	2023-07-19 00:13:11.000000000 +0000
d9 1
a9 1
@@@@ -399,16 +399,16 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d33 1
a33 1
@@@@ -416,8 +416,8 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d44 1
a44 1
@@@@ -427,15 +427,15 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d64 1
a64 1
@@@@ -444,7 +444,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d73 1
a73 1
@@@@ -453,27 +453,27 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d109 1
a109 1
@@@@ -484,9 +484,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d122 1
a122 1
@@@@ -494,7 +494,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d131 1
a131 1
@@@@ -506,22 +506,22 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d162 1
a162 1
@@@@ -548,12 +548,12 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d177 1
a177 1
@@@@ -666,9 +666,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d185 1
d187 5
a191 4
       $(info using libpng: $(call find_lib,png) $(call find_include,png))
       ifneq (,$(call find_include,zlib))
         ifneq (,$(call find_lib,z))
@@@@ -917,7 +917,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d200 1
a200 1
@@@@ -1315,15 +1315,15 @@@@ endif
d217 1
a217 1
   LDFLAGS_O = 
@


1.2
log
@emulators/open-simh: update to 2022-12-02.

- Improvements mainly in AltairZ80, PDP11.
- Stop trying to disable LTO, since it is now explicitly only enabled when
  LTO=1 is given.
- Allow compiler warnings for now; pkgsrc build warns about a re#define
  where native build doesn't.
@
text
@d1 1
a1 1
$NetBSD: patch-makefile,v 1.1 2022/06/06 14:20:07 rhialto Exp $
d7 1
a7 1
--- makefile.orig	2022-12-05 17:16:52.000000000 +0000
d9 1
a9 1
@@@@ -366,16 +366,16 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d33 1
a33 1
@@@@ -383,8 +383,8 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d44 1
a44 1
@@@@ -394,15 +394,15 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d64 1
a64 1
@@@@ -411,7 +411,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d73 1
a73 1
@@@@ -420,27 +420,27 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d109 1
a109 1
@@@@ -451,9 +451,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d122 1
a122 1
@@@@ -461,7 +461,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d131 1
a131 1
@@@@ -473,22 +473,22 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d162 1
a162 1
@@@@ -515,12 +515,12 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d177 1
a177 1
@@@@ -633,9 +633,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d189 1
a189 1
@@@@ -884,7 +884,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d198 2
a199 2
@@@@ -1280,15 +1280,15 @@@@ endif
 OPTIMIZE ?= -O2
d201 1
a201 1
   CFLAGS_G = -g -ggdb -g3
@


1.1
log
@Add emulators/open-simh.

The fork from emulators/simh due to licensing issues.
@
text
@d1 1
a1 1
$NetBSD: patch-makefile,v 1.7 2022/04/03 14:33:42 rhialto Exp $
a2 4
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)
NO_LTO=1 is in effect for gcc and clang, except Darwin.
d7 1
a7 1
--- makefile.orig	2022-04-01 19:37:11.000000000 +0000
d9 1
a9 10
@@@@ -307,7 +307,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
       $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
     endif
   endif
-  LTO_EXCLUDE_VERSIONS = 
+  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
   PCAPLIB = pcap
   ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
     OS_CCDEFS += -D_GNU_SOURCE -DSIM_ASYNCH_IO 
@@@@ -348,16 +348,16 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d33 1
a33 1
@@@@ -365,8 +365,8 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d44 1
a44 1
@@@@ -376,15 +376,15 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d64 1
a64 1
@@@@ -393,7 +393,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d73 1
a73 1
@@@@ -402,27 +402,27 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d109 1
a109 1
@@@@ -433,9 +433,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d122 1
a122 1
@@@@ -443,7 +443,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d131 1
a131 1
@@@@ -455,22 +455,22 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d162 1
a162 1
@@@@ -497,12 +497,12 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d177 1
a177 1
@@@@ -611,9 +611,9 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d189 1
a189 1
@@@@ -803,7 +803,7 @@@@ ifeq (${WIN32},)  #*nix Environments (&&
d198 2
a199 2
@@@@ -1198,11 +1198,11 @@@@ ifneq (,$(UNSUPPORTED_BUILD))
 endif
d205 1
d208 3
a210 4
-    CFLAGS_O = -O2 -fno-strict-overflow
+    CFLAGS_O += -O2 -fno-strict-overflow
     GCC_OPTIMIZERS_CMD = ${GCC} --help
     NO_LTO = 1
d212 2
a213 7
@@@@ -1210,7 +1210,7 @@@@ else
     ifeq (Darwin,$(OSTYPE))
       CFLAGS_O += -O4 -flto -fwhole-program
     else
-      CFLAGS_O := -O2
+      CFLAGS_O += -O2
     endif
d216 1
@