From nobody Sun Mar 20 10:23:42 2022 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 C2E8E1A1EE9C; Sun, 20 Mar 2022 10:23:42 +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 4KLv3f51cNz3krN; Sun, 20 Mar 2022 10:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647771822; 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=pCtna8uvYpSOQucgPMtgY0uaI6yMHhF9Mm67J+3N+Lo=; b=PyI+ZC1r+kPNXNLCe9eH0zqM6oJRs7EzbHdlmyIsFU3X0R2ySVPLeRnRoxpaiScLYGeJNn cjdmyKU0n4TndVOMNTaLqGYf5c4lvZE1G727zKzyJaDsrpRgE5493SZaNhUOPb9Q7YI7QV 6L/98HNm8JWUXESaMmTuJJXafYQfOsxPBC3T68mFhdO1hgJNDoQ/bVfMxf+ZQRJFVO5gkI J8BMxuGQZGxd8yVN0dJxodFx8iKWSSb1jx3dzF6TcGu9a2aK4z98ERP9p1yqCxlhLV5kws WfwykDHbk2rKXTrit58qcrmsKKqt2npVPlpZp7oz8hwr0EUY/KshSyZr+jWg9g== 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 8DA56255B5; Sun, 20 Mar 2022 10:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22KANgZP035981; Sun, 20 Mar 2022 10:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22KANgDp035980; Sun, 20 Mar 2022 10:23:42 GMT (envelope-from git) Date: Sun, 20 Mar 2022 10:23:42 GMT Message-Id: <202203201023.22KANgDp035980@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 617b984c77b2 - main - emulators/yaze-ag: fix build on arch != amd64 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 617b984c77b223ad2ba1d91d4880168fba6f6aff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647771822; 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=pCtna8uvYpSOQucgPMtgY0uaI6yMHhF9Mm67J+3N+Lo=; b=T+eNgI7HgVrXyGBcrxjFC/uq66GYwC1sHj0S5gvYUVgglthlOATcfMtL+0W10MlVaE28+l EnE6pgp4EHF5z8nQ765x7txbPxbR2UaohHbEKXsCz8eL/x9ABG5pUm8je2HHY90FrXIz9C 7J1dKxdUW05LS6cc/K/OfpxKPblM3OqENR8cIxIL+fgfCBAeZZRPhGDdTiZ3bNpk9e9j8A KWFsB0tRjgK641BIcVZLatrwJAP1WDJUYC65x6CuLzyBOmuupRxnlqkE8slCQyKbTkLVnu 6QJSdBqMvGkVmNhHM4vraiZPbI4DoMyvxXAc0NJ0yI1UUEyvNZz6SI4bE9J3WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647771822; a=rsa-sha256; cv=none; b=aqYEBeg/Ky38mTPcixovehSLxvG61ch9N68OGLPn7Xl75ruD8F6sFlMgBku9lII2CHmBSN wzkoifC2ZBLLoRNzF6fIGuZM9GWLjbMTxXdXJ0Tuo9zBmmDahl5jtejUEZkkfVr0zSYPR2 rH07fSljCHtMkh3xNaKq2SmMRbzFguLItpx8++VVNRhkof5QPzOQ/ophNYnxrTdrOgfEU8 aJYZ/rGzzkFD6AzknNPhZSn7ACa+vilOnssiVwjE71f7Q6Q/W1+Ya5PpwjMLuSNn4YHY8x nqrH+bNKZOMa544g2djFWVdsWK8BIy20cWKLAh/BUTnBkE2CGsx2Vw8lIkStrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=617b984c77b223ad2ba1d91d4880168fba6f6aff commit 617b984c77b223ad2ba1d91d4880168fba6f6aff Author: Stefan Eßer AuthorDate: 2022-03-20 10:20:22 +0000 Commit: Stefan Eßer CommitDate: 2022-03-20 10:20:22 +0000 emulators/yaze-ag: fix build on arch != amd64 There was a bogus -march=x86-64 option in Makefile_freebsd which made the compiler complain about an unsupported architecture on all other architectures. Reported by: pkg-fallout --- emulators/yaze-ag/Makefile | 5 +++-- emulators/yaze-ag/files/patch-Makefile__freebsd | 12 +++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile index 67489c5ac711..939f861f6490 100644 --- a/emulators/yaze-ag/Makefile +++ b/emulators/yaze-ag/Makefile @@ -1,5 +1,6 @@ PORTNAME= yaze-ag DISTVERSION= 2.51.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/ @@ -13,8 +14,6 @@ LIB_DEPENDS= libreadline.so:devel/readline USES= compiler:c11 -CONFLICTS_INSTALL= cpmtools - MAKEFILE= Makefile_freebsd MAKE_ENV= BINDIR=${PREFIX}/bin \ DESTDIR="${STAGEDIR}" \ @@ -26,6 +25,8 @@ MAKE_ENV= BINDIR=${PREFIX}/bin \ MANDIR=${MAN1PREFIX}/man/man1 \ OPTIMIZE="${CFLAGS}" +CONFLICTS_INSTALL= cpmtools + OPTIONS_DEFINE= DOCS post-build: diff --git a/emulators/yaze-ag/files/patch-Makefile__freebsd b/emulators/yaze-ag/files/patch-Makefile__freebsd index bc31e1ce3328..b70057f7bc78 100644 --- a/emulators/yaze-ag/files/patch-Makefile__freebsd +++ b/emulators/yaze-ag/files/patch-Makefile__freebsd @@ -19,7 +19,17 @@ #OPTIMIZE = -g -m486 #OPTIMIZE = -g -save-temps -m486 -@@ -210,29 +210,29 @@ cdm: cdm.o +@@ -59,7 +59,8 @@ DOCHTMLDIR = $(LIBDIR)/doc_html + #OPTIMIZE = -O3 -march=athlon64 # 64 Bit AMD + #OPTIMIZE = -O3 -march=athlon64-sse3 + #OPTIMIZE = -O3 -march=barcelona +-OPTIMIZE = -O3 -march=x86-64 ++#OPTIMIZE = -O3 -march=x86-64 ++OPTIMIZE = -O3 + + # -DUSE_GNU_READLINE for command recall/editing and filename completion + # -DBGii_BUG works around a problem in Backgrounder II +@@ -210,29 +211,29 @@ install: all $(CC) $(CFLAGS) cdm.o $(LIBS) -o $@ install: all