From nobody Mon Jan 17 16:15:16 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 DD4C61969D6E; Mon, 17 Jan 2022 16:15:17 +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 4Jcxnx2zZMz4vLb; Mon, 17 Jan 2022 16:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436117; 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=9oI/mMvHKtSXV7qwsg1/f6cGH7rvMfpLK0TC5F3+unM=; b=RQ1Tv58OZGUy5weVWOXotIA39X+G5E25uZZIZ44rwkorHOAn55gQJfacBtw/zJsOFSiyvP JBXN8Sy5kp5ku4Ok+3jNFh6TAOyIjEyziS7FI4cz0MwYiYcNe/dIHPMii5vw5rzH0khDre nE7KLuA3Ui65NMy1DCuQGrtADrPDk2LctnLsoE0ihoYSNDHf+e3m46G+XbEME5MQMy+6Wy u9pHyPvmG7mHrFKI331rVyMOeiX/PUPq8tSBh37UNV2RJ8W+IQUvpX8JWxz9ddNq8lqo57 2+Bbn3SWsdopKxVnmA41qUZzi2frgdtxLQrGhrzfIez6LzHt/Eg8z6b+mwnPEA== 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 4E5DA11195; Mon, 17 Jan 2022 16:15:16 +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 20HGFGlf005518; Mon, 17 Jan 2022 16:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HGFG9b005517; Mon, 17 Jan 2022 16:15:16 GMT (envelope-from git) Date: Mon, 17 Jan 2022 16:15:16 GMT Message-Id: <202201171615.20HGFG9b005517@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 6a4e552e4076 - main - net/realtek-re-kmod: allow building for other architectures 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: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a4e552e40762e99e2b7b15e9542d46fbfd3c6d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436117; 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=9oI/mMvHKtSXV7qwsg1/f6cGH7rvMfpLK0TC5F3+unM=; b=HB2aUs9zL2F7d+tQpI+4Yn9ND8NVoM6MSgD+MP/9kVe0AGl38RTdRdIat4LVPRQOaRHXUu hrAIiLlo3p7mI+xfr/hGkDACLKH8FOYjDQ7Krh3j9ClUANr1KIfd5MQKGjIXC5NChna7Uf 3UVLsU89dJs7ZmqRnVu7vuU4zHDjG7sJombSsc+jZHfOkvYfE+VHXfNdNSFfQiKFhnfHgY e1inrrnl6yh5YcSkq4xaxi6YtkPdLN4lfjl7fVGwXQhWLcPEwGo0fbLj4Ro0w+YOwzuN5q keK8ggZHG7+/LAKEWS44iA+B3/gkR4wO32gg2wPQZplOAFwF62l2xk+vxDQYKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642436117; a=rsa-sha256; cv=none; b=F9FHNMwwHsc+nc/Ev6j+LMK0whKDqlaJIy6qq4F0d6UoIPIAfZrBDNrRBuqZaZOojrtG8T Dq6Bjeulodp6F6PaSVSCXXP3w0AKohlK5TdxHtbYZ8hPdzigPN5STY/jSXRLg6CDzZDHii jZ+P4E1DS+JWS4vrzjxCJyR4HBotAjJRMRlPqteVQBWtet7434yP1nzoa0o7Gw3Hh/dTDu sb5deQe1Ux3Pve1f0i7ZTvOD3nykqGzFMqKlwBJD2UM/lnSNC42tZESDkz4zCtYNP2Uur/ xCo+nPz5A1VJYEF3wcY0vXbJrUbCxZlJ1HpcThO0agZw3vzOni6d3soY+3ipEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a4e552e40762e99e2b7b15e9542d46fbfd3c6d9 commit 6a4e552e40762e99e2b7b15e9542d46fbfd3c6d9 Author: Alex Dupre AuthorDate: 2022-01-17 16:11:24 +0000 Commit: Alex Dupre CommitDate: 2022-01-17 16:14:06 +0000 net/realtek-re-kmod: allow building for other architectures Disable dash support on such archs and fix version number. PR: 258473 Submitted by: Franco Fichtner --- net/realtek-re-kmod/Makefile | 9 +++------ net/realtek-re-kmod/files/patch-optional-dash | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/net/realtek-re-kmod/Makefile b/net/realtek-re-kmod/Makefile index 9b84f684119f..0b48af7d3664 100644 --- a/net/realtek-re-kmod/Makefile +++ b/net/realtek-re-kmod/Makefile @@ -1,22 +1,19 @@ # Created by: Alex Dupre PORTNAME= re -DISTVERSION= v196.04 -PORTREVISION= 3 +PORTVERSION= 196.04 +DISTVERSIONPREFIX= v CATEGORIES= net MASTER_SITES= LOCAL/ale PKGNAMEPREFIX= realtek- PKGNAMESUFFIX= -kmod -DISTNAME= rtl_bsd_drv_${DISTVERSION} +DISTNAME= rtl_bsd_drv_${DISTVERSIONPREFIX}${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= Kernel driver for Realtek PCIe Ethernet Controllers LICENSE= BSD4CLAUSE -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= uses x86-specific code - USES= kmod tar:tgz uidfix PLIST_FILES= ${KMODDIR}/if_re.ko diff --git a/net/realtek-re-kmod/files/patch-optional-dash b/net/realtek-re-kmod/files/patch-optional-dash new file mode 100644 index 000000000000..4aee04bc51c3 --- /dev/null +++ b/net/realtek-re-kmod/files/patch-optional-dash @@ -0,0 +1,20 @@ +--- if_re.c.orig 2022-01-17 17:01:39 UTC ++++ if_re.c +@@ -4355,6 +4355,7 @@ + sc->re_dash = re_check_dash(sc); + + if (sc->re_dash) { ++#if defined(__amd64__) || defined(__i386__) + if (HW_DASH_SUPPORT_TYPE_3(sc)) { + u_int64_t CmacMemPhysAddress; + bus_space_handle_t cmac_ioaddr; +@@ -4374,6 +4375,9 @@ + sc->re_mapped_cmac_handle = cmac_ioaddr; + } + } ++#else ++ sc->re_dash = 0; ++#endif + } + + switch(sc->re_type) {