Date: Sat, 29 Aug 2020 02:23:59 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546866 - in head/emulators/simh-hp3000: . files Message-ID: <202008290223.07T2Nxv8032013@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sat Aug 29 02:23:58 2020 New Revision: 546866 URL: https://svnweb.freebsd.org/changeset/ports/546866 Log: 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 MFH: 2020Q3 (-fno-common build fix) Added: head/emulators/simh-hp3000/files/patch-SCP_makefile (contents, props changed) Modified: head/emulators/simh-hp3000/Makefile Modified: head/emulators/simh-hp3000/Makefile ============================================================================== --- head/emulators/simh-hp3000/Makefile Sat Aug 29 02:21:46 2020 (r546865) +++ head/emulators/simh-hp3000/Makefile Sat Aug 29 02:23:58 2020 (r546866) @@ -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 Added: head/emulators/simh-hp3000/files/patch-SCP_makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/simh-hp3000/files/patch-SCP_makefile Sat Aug 29 02:23:58 2020 (r546866) @@ -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 + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008290223.07T2Nxv8032013>