svn commit: r546868 - in branches/2020Q3/emulators/simh-hp3000: . files

[Kyle Evans]

Author: kevans
Date: Sat Aug 29 02:26:56 2020
New Revision: 546868
URL: https://svnweb.freebsd.org/changeset/ports/546868

Log:
  MFH: r546866
  
  emulators/simh-hp3000: fix the build with LLVM 11.
  
  Similar to the patch for emulators/simh-hp2100, drop an -fcommon in to fix
  the build in the face of GCC 10 / LLVM 11 switching the default to
  -fno-common.
  
  Minor cleanup while we're here, remove USES= compiler and just use ${CC} for
  the compiler.
  
  PR:		248872
  
  Approved by:	ports-secteam (implicit, -fno-common build fix)

Added:
  branches/2020Q3/emulators/simh-hp3000/files/patch-SCP_makefile
     - copied unchanged from r546866, head/emulators/simh-hp3000/files/patch-SCP_makefile
Modified:
  branches/2020Q3/emulators/simh-hp3000/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/emulators/simh-hp3000/Makefile
==============================================================================
--- branches/2020Q3/emulators/simh-hp3000/Makefile	Sat Aug 29 02:25:38 2020	(r546867)
+++ branches/2020Q3/emulators/simh-hp3000/Makefile	Sat Aug 29 02:26:56 2020	(r546868)
@@ -22,7 +22,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 RUN_DEPENDS=	${LOCALBASE}/share/doc/hpdoc/simh_doc.pdf:emulators/simh-hpdoc
 
-USES=		compiler gmake dos2unix zip
+USES=		gmake dos2unix zip
 
 NO_WRKSUBDIR=	yes
 
@@ -34,7 +34,7 @@ SUB_FILES=	hp3000.1
 .include <bsd.port.pre.mk>
 
 do-build:
-	(cd ${WRKSRC}; GCC=${CHOSEN_COMPILER_TYPE} ${GMAKE} -C SCP hp3000)
+	(cd ${WRKSRC}; GCC=${CC} ${GMAKE} -C SCP hp3000)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hp3000 ${STAGEDIR}${PREFIX}/bin

Copied: branches/2020Q3/emulators/simh-hp3000/files/patch-SCP_makefile (from r546866, head/emulators/simh-hp3000/files/patch-SCP_makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/emulators/simh-hp3000/files/patch-SCP_makefile	Sat Aug 29 02:26:56 2020	(r546868, copy of r546866, head/emulators/simh-hp3000/files/patch-SCP_makefile)
@@ -0,0 +1,17 @@
+--- SCP/makefile.orig	2020-08-23 21:58:56 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
+ 
+