From nobody Mon Dec 23 13:01:47 2024 X-Original-To: dev-commits-ports-all@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 4YGypM1t0Xz5h2Yy; Mon, 23 Dec 2024 13:01:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGypM1Ms5z4TTQ; Mon, 23 Dec 2024 13:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734958907; 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=OvWp6oQLON30ASZnHFTkVW6c/BzGyJ17h/0xbDAJ92U=; b=xF02f3QFlU8thhThO9Jt8ULUl6VwH9V/0s6C3CbIvZb+gBwZSCfJxxJ5hpuhHzVr68cvIZ Md9ZtGfy8rgIcngKSdEhFgXe2RII3x1O2OPp1kGogyzX/VTHo8du0Svah/5BnL9MagoY0G cNoF9Dcxftr5WeWUR3XYtf9G1qlFCWyfxfP4dW/i2m7cmK3up9n56dtxM/KibzQ5rvSc57 PQl+ShdkgK03a58dWI+lzrHg4EMsLxd15pxHWqMYBTRKlYftFb6DDEqfAkCJGsXNdVlJ7P 7VFLCoZtBKQg2iaEaoR2O1tc1zZ0/KckB8SwXQK2cecDWCfYJMwOHZCGknmmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734958907; 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=OvWp6oQLON30ASZnHFTkVW6c/BzGyJ17h/0xbDAJ92U=; b=nMx/qvjTGc1xv7hnOcvZUg7gDJ7mBqoG/hWQsparmBEnU5i0u664JMXm1ZWrIhV4yW+Ehk jI8sKqI9J8BPN4qslJsrqDLaaIlWk3LL1VATtwVQs2LncHDhFOGxTwl+idxy9+jMuEJNay zLZzj11LnqDNl/OSu4d4PoHpJlkWEy+Gs6fSOE7w3Nlg8JF0nNaNeqDZGV57umW/lbxtXy VAP2ry3ZVxn15txSjnavcigVmrYUl4ZLgty1Qhz+wegZKvU9QrIdlTqJPfcR+hZx6KduS+ MzVb7bI37o3CH8EvKzLS3CmDa5+/kc0aHze9FvTdE4iSK+Vav1vrGefZtN5kLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734958907; a=rsa-sha256; cv=none; b=yTP45j/yOF8/7y9flYUUyaPwm29Khl861lF6iiRaoGYlFCmoN8sETunVf6nFXHTjNKFpGo V12/RDjc4VLkAK6B8+yR90ynCFAtqaCf4Mr8DaX3VnT2onpx4LI37HjOiB1jc8a4eMKt+N fxzdQ9gwe5EuI7rwqT3Cd2hTGcpRaPxalwvsQLC2K1ItXBYmmvw+XYpm8TN6xNtGUe4fvv 89ABksZSjKkmuGnorvvJAtW8aEB6xzqUXB7B7VorYnEiv2Ph0lE4XVewTXGfGFCX7teu6E omLASQ36NvUcoXzy+8CZRFVwRExKf8SXhMIcLGsgr2+HlXkGrMEKXvYlRhN6tg== 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 4YGypM0yzLzvH5; Mon, 23 Dec 2024 13:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BND1lT3004434; Mon, 23 Dec 2024 13:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BND1l5Y004431; Mon, 23 Dec 2024 13:01:47 GMT (envelope-from git) Date: Mon, 23 Dec 2024 13:01:47 GMT Message-Id: <202412231301.4BND1l5Y004431@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joel Bodenmann Subject: git: 7ff81df97834 - main - devel/openocd: Unbreak aarch64 build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ff81df978340dd7d36c28c38492eb5ec7af6cb9 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ff81df978340dd7d36c28c38492eb5ec7af6cb9 commit 7ff81df978340dd7d36c28c38492eb5ec7af6cb9 Author: Robert Clausecker AuthorDate: 2024-12-23 12:34:16 +0000 Commit: Joel Bodenmann CommitDate: 2024-12-23 13:01:12 +0000 devel/openocd: Unbreak aarch64 build Working around an issue where upstream provided page size macros are colliding with page size macros from . PR: 283034 Reported by: Duane (parakleta@darkreality.org) --- devel/openocd/Makefile | 7 +------ devel/openocd/files/patch-src_target_nds32__tlb.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile index f19f6b0540d4..22b500114d87 100644 --- a/devel/openocd/Makefile +++ b/devel/openocd/Makefile @@ -1,6 +1,6 @@ PORTNAME= openocd DISTVERSION= 0.12.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= SF @@ -11,11 +11,6 @@ WWW= https://openocd.sf.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -# Note: A local patch would be feasible but upstream has removed support for the offending feature -# implementation since their last release (0.12.0). As such, this will no longer be relevant -# from 0.13.0 onwards. Hence we're not addressing this "limitation" right now. -BROKEN_aarch64= fails to build: src/target/nds32_tlb.h:25:2: error: expected identifier PAGE_SIZE_4K = 0 - USES= gmake libtool makeinfo pkgconfig tar:bzip2 GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share diff --git a/devel/openocd/files/patch-src_target_nds32__tlb.h b/devel/openocd/files/patch-src_target_nds32__tlb.h new file mode 100644 index 000000000000..04b1a2494ec7 --- /dev/null +++ b/devel/openocd/files/patch-src_target_nds32__tlb.h @@ -0,0 +1,16 @@ +--- src/target/nds32_tlb.h.orig 2022-09-18 13:46:16 UTC ++++ src/target/nds32_tlb.h +@@ -10,6 +10,13 @@ + + #include "nds32.h" + ++#ifdef PAGE_SIZE_4K ++# undef PAGE_SIZE_4K ++#endif ++#ifdef PAGE_SIZE_8K ++# undef PAGE_SIZE_8k ++#endif ++ + enum { + PAGE_SIZE_4K = 0, + PAGE_SIZE_8K,