Attachment #217482 for bug #248872

View | Details | Raw Unified | Return to bug 248872
Collapse All | Expand All

Lines 22-28 Link Here

(-)./Makefile (-2 / +2 lines)
22		22
23	RUN_DEPENDS= ${LOCALBASE}/share/doc/hpdoc/simh_doc.pdf:emulators/simh-hpdoc	23	RUN_DEPENDS= ${LOCALBASE}/share/doc/hpdoc/simh_doc.pdf:emulators/simh-hpdoc
24		24
25	USES= compiler gmake dos2unix zip	25	USES= gmake dos2unix zip
26		26
27	NO_WRKSUBDIR= yes	27	NO_WRKSUBDIR= yes
28		28
Lines 34-40 Link Here
34	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
35		35
36	do-build:	36	do-build:
37	(cd ${WRKSRC}; GCC=${CHOSEN_COMPILER_TYPE} ${GMAKE} -C SCP hp3000)	37	(cd ${WRKSRC}; GCC=${CC} ${GMAKE} -C SCP hp3000)
38		38
39	do-install:	39	do-install:
40	${INSTALL_PROGRAM} ${WRKSRC}/hp3000 ${STAGEDIR}${PREFIX}/bin	40	${INSTALL_PROGRAM} ${WRKSRC}/hp3000 ${STAGEDIR}${PREFIX}/bin




--- 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
 
 

Return to bug 248872

Line 0 Link Here

(-)./files/patch-SCP_makefile (+17 lines)
	1	--- SCP/makefile.orig 2020-08-23 21:58:56 UTC
	2	+++ SCP/makefile
	3	@@ -532,10 +532,12 @@ ifneq ($(DONT_USE_READER_THREAD),)
	4	endif
	5
	6
	7	-# Shut up annoying clang default warnings.
	8	+# Shut up annoying clang default warnings, and also fix
	9	+# multiply defined symbols on clang 11 and above
	10
	11	-ifeq ($(GCC),clang)
	12	+ifeq ($(findstring clang,$(COMPILER_NAME)),clang)
	13	OS_CCDEFS += -Wno-parentheses -Wno-bitwise-op-parentheses -Wno-dangling-else
	14	+ CFLAGS_O += -fcommon
	15	endif
	16
	17