From nobody Sun Apr 09 00:55:19 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 4PvDD75HXXz4556R; Sun, 9 Apr 2023 00:55:19 +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 4PvDD72LG8z3qMT; Sun, 9 Apr 2023 00:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681001719; 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=9MBrTjdk2bVQd6b1M+QZua2SrHFb7SciMsiXifvrXCw=; b=aMD8/y3NJWiIPJtSz8hs4sOvvqbyTv+xslkat32qQe024sqUuTqkDKKnf9hTKbW6tkR4gp 2NFiSBwrzcfx9PNW8evoBccRXfgoTUF1b9BvAYp5B23e0JwZKQfsBhxXQ+gRWyBdCjhec6 vJ6IBdAYKasZAEBSU9UHgsk43b1JxdvZ0Dbyi8jPtLtfLTYqO+r0cmr3mKylTrjmM0uvac CaVI6lAF1VRzjP8ZgSK+il2DODEk7ubhHMKXPQX5YFzS5nA+VMPA58tjvKVoyNT+1rD0LQ iDsK1QKBAKnokl0ARTk2Q9BwjQrqVCAluySqzCG7bX/BzS52ntNcdkCl2pUiag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681001719; 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=9MBrTjdk2bVQd6b1M+QZua2SrHFb7SciMsiXifvrXCw=; b=s0tYlqTabi1hB1QDw2TGJBjL9WIyZObjYuGK2Hxn27e6B8BXN0GaQ6xona2TQIluFQGtUo kh9a/Qr8MgxxjOX8ZH27aFjwa9zweSfBsYPzyPdKNbd4aPSyEljeFmlM49gCRvyhJCHbYR Cr2WqyX35Yv+WnX7B4W7PfmCMFKb1pB3FWNWPLUscI7WtdO77ElAUH1Tw4zuqAv6gPWRHp 4Bjb41jlSmdXJAeu1XyxXUQaAwQFU6XGx+E8OoIJ9Vh2HP44YNgR9Ilqo2DtUPl8jrEaBE XL7U0hcSbriRqu+amEWGAPVhp85cnshxf7Y7WKEj+kpSAvfBrxDbBDvZ+y1T/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681001719; a=rsa-sha256; cv=none; b=Y+gTSA7J1QkE80rACk5iZXOj7mlV0r2Sx6modhiRC7jBL/js+QsIVkMvjwvmupztWxgDuF PfO78jqJqAmkMwa2t29GJgfq5x+n1XmJpSnDE1cU0h8V+G8ThbX5dN3uxebeFLDvcj5aJJ /dOik53peW5TtNgYIs2AbzfzPPHczWJxmaLLHAxnlc39sjo+pDO+g7cpdA5UPoPtMwz8wx WQzQoSCDNIKlfOxLWBMXBMt7sjdnwXCBIpVwwnlDB0sC93tbSRX1u+JzmWgSMm0QLcgpeD j1HI61pPP5p3673ondkD+G7uJQSOjpwmAAr2ke1pg50/3W2LbY1NP3cKhkBeNg== 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 4PvDD71GLpzpJ8; Sun, 9 Apr 2023 00:55:19 +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 3390tJlp027565; Sun, 9 Apr 2023 00:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3390tJG9027564; Sun, 9 Apr 2023 00:55:19 GMT (envelope-from git) Date: Sun, 9 Apr 2023 00:55:19 GMT Message-Id: <202304090055.3390tJG9027564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: c3c2129c94d5 - main - devel/{p4,p4api}: Unbreak build on arm 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: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3c2129c94d55bb857ff2bbb07a81779efc70fd4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3c2129c94d55bb857ff2bbb07a81779efc70fd4 commit c3c2129c94d55bb857ff2bbb07a81779efc70fd4 Author: Craig Leres AuthorDate: 2023-04-09 00:54:52 +0000 Commit: Craig Leres CommitDate: 2023-04-09 00:54:52 +0000 devel/{p4,p4api}: Unbreak build on arm Also change devel/p4api to use devel/p4 files/patches and distinfo. PR: 270531 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/files/patch-Jamrules | 6 +++--- devel/p4/files/patch-zlib_deflate.c | 11 +++++++++++ devel/p4api/Makefile | 4 ++++ devel/p4api/distinfo | 3 --- devel/p4api/files/patch-Jamrules | 28 ---------------------------- 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules index d89bc59e9d54..c63b4f543364 100644 --- a/devel/p4/files/patch-Jamrules +++ b/devel/p4/files/patch-Jamrules @@ -1,6 +1,6 @@ ---- Jamrules.orig 2018-02-01 21:40:54 UTC +--- Jamrules.orig 2023-01-19 09:37:52 UTC +++ Jamrules -@@ -449,12 +449,11 @@ +@@ -673,12 +673,11 @@ # P4BIN is set to ../p4-bin (relative to P4) SubDir AllP4 p4 ; # where we are @@ -14,7 +14,7 @@ $(BUILD) $(TYPE:L) ; -@@ -931,11 +930,6 @@ +@@ -1224,11 +1223,6 @@ OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; _mflags = ; diff --git a/devel/p4/files/patch-zlib_deflate.c b/devel/p4/files/patch-zlib_deflate.c new file mode 100644 index 000000000000..b1c8c81fe1de --- /dev/null +++ b/devel/p4/files/patch-zlib_deflate.c @@ -0,0 +1,11 @@ +--- zlib/deflate.c.orig 2023-04-08 02:21:18 UTC ++++ zlib/deflate.c +@@ -56,7 +56,7 @@ + * Perforce change. Disable neon speedup (for now) + * on Apple M1 builds. + */ +-#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__) ++#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) || defined( OS_FREEBSD ) ) && defined(__aarch64__) + #undef __ARM_NEON__ + #undef __ARM_NEON + #endif diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile index 3cb2963f3d19..970e1f63335e 100644 --- a/devel/p4api/Makefile +++ b/devel/p4api/Makefile @@ -19,6 +19,10 @@ BUILD_DEPENDS= ${JAM}:devel/jam USES= tar:tgz +PATCHDIR= ${.CURDIR}/../p4/files + +DISTINFO_FILE= ${.CURDIR}/../p4/distinfo + OPTIONS_DEFINE= EXAMPLES WRKSRC= ${WRKDIR}/p4source-${PORTVERSION} diff --git a/devel/p4api/distinfo b/devel/p4api/distinfo deleted file mode 100644 index 895f00dbc4d1..000000000000 --- a/devel/p4api/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1679584778 -SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b -SIZE (p4source-2407422.tgz) = 6325949 diff --git a/devel/p4api/files/patch-Jamrules b/devel/p4api/files/patch-Jamrules deleted file mode 100644 index d89bc59e9d54..000000000000 --- a/devel/p4api/files/patch-Jamrules +++ /dev/null @@ -1,28 +0,0 @@ ---- Jamrules.orig 2018-02-01 21:40:54 UTC -+++ Jamrules -@@ -449,12 +449,11 @@ - # P4BIN is set to ../p4-bin (relative to P4) - - SubDir AllP4 p4 ; # where we are -- SubDir AllP4 p4-bin ; # where we want to be -+ SubDir AllP4 p4 p4-bin ; # where we want to be - SubDir P4BIN ; # name is that - SubDir AllP4 p4 ; # back to where we started - - EXEC_SUB_TOKENS = -- $(OS:L)$(OSVER:EL)$(OSPLAT:EL) - $(BUILD) - $(TYPE:L) ; - -@@ -931,11 +930,6 @@ - OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; - - _mflags = ; -- switch $(OSPLAT:U) -- { -- case X86 : _mflags = -m32 ; -- case X86_64 : _mflags = -m64 ; -- } - - $(GENFLAGS) += $(_mflags) -pipe ; - LINKFLAGS += $(_mflags) ;