From nobody Sat Aug 19 17:57:42 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSmfv1JqNz4qyb0; Sat, 19 Aug 2023 17:57:43 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSmfv0pRgz4T7w; Sat, 19 Aug 2023 17:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692467863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrm3f1mjDDisTGSS1dSsZYcFKav+CON2eS2EzlnGFD8=; b=On1I8RaR9WIRtX1Oi29LYmihlimdpSRbVYhzjx3ofRRU5TM6R2IUUhqZzcpanOMV43J3nP gkcerVlCfpiBuIETzKiHO/pTy05e/cF+gRx1Uo1od/RGlwZIH76nYyq2Sek1JfgRuB5nry zsXtdUKuxdaeRektlkajOWf75BiDIhtBi30ncdmeox8KIiX+XeGjhjVpstNRBfWAck7T8u GVe64l7dThPY7upH6+Dje7gdM3i0BBEEyRuHPxmJx/Bm0DMIw0c5cz6wTDPmdageHnYdBK PzYgjvyavlBwimcswuzh4Pwu1msgjUp5+xRFixKzl5iUUWRgeBOh+yFeYr0auA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692467863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrm3f1mjDDisTGSS1dSsZYcFKav+CON2eS2EzlnGFD8=; b=l9WziUMomCZEJ3Ut1rhOgPtIVnIkoyRi/zK7ZaxUI/MVR2HWWvYlB0sQ56mhj7vZLmJ0Ft 9jB5y4zDd6s5wcMGAjESb0VW8/hSmd3nj7ojkQ8NXDOVrrvoMrGsO9Lv7LmCtvffWbmzYq 3Mt5HcpHVDGOdNfanFj3RF6Ri8Mhl86qGONaPSvCGiqLujeKPhZDf8IbKGf4UcYS4WkUBl ggMJq0m0Gmz6xk7lvL+lh6EWFocYd8GPTNY5wYwWymiT5yfP31afywvORMNbLyOsUCR47F 14bDXVT+S2otx0G8Q1HFcU7lT6uwo0W1XMHy+Ml43TzOLoXfzow5NgbDhA9k9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692467863; a=rsa-sha256; cv=none; b=Oz8fmQhQF8W6/SZLp9LxBGobxuflw7+NKS74PxqaIq4C7fBMAkWDRGz1IQuMbRBX9DEpAz tWKFnrR6/1q/rT9iYx9Kaks+mqjtDxgOB8wmHwF+wXHDz6wlTxhhKQ8PmSDHP+xdPJvSG/ F4tH4eHR2YK/u592AgaLLRhkHzB6oouDtT1vZDhHcoFj3Y3pwufI9P8T9Ia1qvMLugY0p/ eDL4maGsu/g+uyb0p/1krHbIBiQbLzwLsuj0B7m64p/b2RgsXbsvnRBJ/v/pqSp4GJBSUt 2KhaXaywBvokxVJZnGT1VpkHpHI5ML/tlO3uxxt9XX3EkkrTmF4ev3amvRrmhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSmft6sMKz166c; Sat, 19 Aug 2023 17:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JHvgg3083677; Sat, 19 Aug 2023 17:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JHvgPM083674; Sat, 19 Aug 2023 17:57:42 GMT (envelope-from git) Date: Sat, 19 Aug 2023 17:57:42 GMT Message-Id: <202308191757.37JHvgPM083674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 37e7d652f24e - main - emulators/dps8m: Restore various port and build fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37e7d652f24e942384ec593873d67ff4f553aaa9 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=37e7d652f24e942384ec593873d67ff4f553aaa9 commit 37e7d652f24e942384ec593873d67ff4f553aaa9 Author: Daniel Engberg AuthorDate: 2023-08-19 17:52:41 +0000 Commit: Daniel Engberg CommitDate: 2023-08-19 17:57:38 +0000 emulators/dps8m: Restore various port and build fixes * Restore verbose build output * Restore build fixes for PPC64 and RISC-V * Disable optimization that overrides framework Approved by: portmgr (blanket, build fix) --- emulators/dps8m/Makefile | 7 +++++++ emulators/dps8m/files/patch-src_Makefile.mk | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/emulators/dps8m/Makefile b/emulators/dps8m/Makefile index 4a2689879a58..748efbfd4bd4 100644 --- a/emulators/dps8m/Makefile +++ b/emulators/dps8m/Makefile @@ -1,6 +1,7 @@ PORTNAME= dps8m DISTVERSIONPREFIX= R DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= gspurki@gmail.com @@ -20,12 +21,18 @@ LIB_DEPENDS= libuv.so:devel/libuv USES= gmake USE_GITLAB= yes +CFLAGS_powerpc64= -Datomic_testandset_64=atomic_testandset_long +CFLAGS_powerpc64le= -Datomic_testandset_64=atomic_testandset_long +CFLAGS_riscv64= -Datomic_testandset_64=atomic_testandset_long + MAKEFILE= GNUmakefile PLIST_FILES= bin/dps8 \ bin/prt2pdf \ bin/punutil +MAKE_ARGS= V=1 NO_LTO=1 + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dps8/dps8 ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/prt2pdf/prt2pdf ${STAGEDIR}${PREFIX}/bin diff --git a/emulators/dps8m/files/patch-src_Makefile.mk b/emulators/dps8m/files/patch-src_Makefile.mk new file mode 100644 index 000000000000..be9c3e886588 --- /dev/null +++ b/emulators/dps8m/files/patch-src_Makefile.mk @@ -0,0 +1,11 @@ +--- src/Makefile.mk.orig 2023-08-13 10:22:22 UTC ++++ src/Makefile.mk +@@ -294,7 +294,7 @@ endif + + _DEBUGOPTFLAG := -g + ifndef TESTING +- OPTFLAGS = -O3 $(_DEBUGOPTFLAG) -U_FORTIFY_SOURCE -fno-stack-protector ++# OPTFLAGS = -O3 $(_DEBUGOPTFLAG) -U_FORTIFY_SOURCE -fno-stack-protector + ifdef DUMA + CFLAGS += -I../dps8 -I. -include dps8_duma.h + OPTFLAGS += -DDUMA=1