From owner-svn-ports-branches@freebsd.org Sat Aug 29 02:26:57 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17E813CB0A4; Sat, 29 Aug 2020 02:26:57 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdgMh6y3Mz3YBr; Sat, 29 Aug 2020 02:26:56 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B86C01EB9B; Sat, 29 Aug 2020 02:26:56 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07T2QugE032517; Sat, 29 Aug 2020 02:26:56 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07T2QuGn032516; Sat, 29 Aug 2020 02:26:56 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008290226.07T2QuGn032516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 29 Aug 2020 02:26:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r546868 - in branches/2020Q3/emulators/simh-hp3000: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in branches/2020Q3/emulators/simh-hp3000: . files X-SVN-Commit-Revision: 546868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 02:26:57 -0000 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 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 + +