Attachment 217482 Details for Bug 248872 – Proposed patch to be added to files/ (as a patch)

[patch] Proposed patch to be added to files/ (as a patch)

hp3000.diff (text/plain), 1.40 KB, created by Bob Eager on 2020-08-24 09:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2020-08-24 09:00:08 UTC

Size: 1.40 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with ydiff -s -w 0
>diff -ruN ../simh-hp3000.orig/Makefile ./Makefile
>--- ../simh-hp3000.orig/Makefile	2020-08-23 22:56:03.318558000 +0100
>+++ ./Makefile	2020-08-23 23:20:34.876427000 +0100
>@@ -22,7 +22,7 @@
> 
> 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 @@
> .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
>diff -ruN ../simh-hp3000.orig/files/patch-SCP_makefile ./files/patch-SCP_makefile
>--- ../simh-hp3000.orig/files/patch-SCP_makefile	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-SCP_makefile	2020-08-23 22:59:21.392337000 +0100
>@@ -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
>+ 
>+ 
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 248872: 217482