Index: head/emulators/simh-hp2100/files/patch-SCP_makefile =================================================================== --- head/emulators/simh-hp2100/files/patch-SCP_makefile (nonexistent) +++ head/emulators/simh-hp2100/files/patch-SCP_makefile (revision 546863) @@ -0,0 +1,17 @@ +--- SCP/makefile.orig 2020-08-23 21:51:23 UTC ++++ SCP/makefile +@@ -532,10 +532,12 @@ ifneq ($(DONT_USE_READER_THREAD),) + endif + + +-# Shut up annoying clang default warnings. ++# Shut up annoying clang default warnings, and also fix ++# multiply defined symbols on clang 11 and above + +-ifeq ($(GCC),clang) ++ifeq ($(findstring clang,$(COMPILER_NAME)),clang) + OS_CCDEFS += -Wno-parentheses -Wno-bitwise-op-parentheses -Wno-dangling-else ++ CFLAGS_O += -fcommon + endif + + Property changes on: head/emulators/simh-hp2100/files/patch-SCP_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property