From nobody Thu Jan 16 11:30:18 2025 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 4YYgdl0s98z5kKTW; Thu, 16 Jan 2025 11:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYgdl0Kyjz3vrc; Thu, 16 Jan 2025 11:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737027019; 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=IMHxzzLUCXV3Em9mKeSOzbgERLimhtHfD1YUeQsB2iQ=; b=VEeHN18MuWJWoRt14dUHbF3DI1rUcdK7ExX7cAkDWQFeV6AOEoO4Qyuv1OOOzNd/0rf2ST qmhw/ucbR3o/Wt63sU68cMz/wQ21sLl9VzbQ9vnsQSHSzsj1cV/yzPHhTGFbI6dSB9DXfp +0DHxFf9D4fMq6RzAywRCXwqIIdxBF4yS7ai1pYDkTo1uBE1sT3LUbMpJDD2e8vpI6x002 EUbnxpC19VY5710Mxm+2mhzeh0TdbLRndMKjm0a8td80IizagZrWQ47wR3aXHDlGnRT8Qb At/Pbt0bKUnNjG4jDSGI7E+0blaX5B0juaEwC2MqMiqT4rzQfHBGcxN/3lOcMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737027019; 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=IMHxzzLUCXV3Em9mKeSOzbgERLimhtHfD1YUeQsB2iQ=; b=mIXQ9mf9gCR/SX7SfWSv23MVRzh+dzVBN5sAtoFJvHbDdqBS32uTFr9ofxsrwWF2DGd0Nn btYEtf/vN7OgJZnws7AGT2vFnp4zmxpRBw7u+Z9WZkWEwwA4dW4kCsTdsoD6CK+9Txy4FE +VylHbcFbGdcPqZWQJWrXbM3DOacK9UphWCY6i8BJY9YDX/RD71ov+ZNFSdjwllAsTE3dL 4kBXfe/QRRnOCzJGpJRAnkUpKiTPIRJnW/zU7Y3wy/5C2YeAv6iVwG5EXyoeB/BG/g0ZKj aJgn/HRggwSXg2fbCZORHIiLJpZn9sswkBDSJ0j181EwfFNPA2bnoteWdH0vUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737027019; a=rsa-sha256; cv=none; b=a+Y3OhHOT3uv9PE5YZpw0cI09DkW/IUyLUpIKq8l02tf1T7mJyQGzwkc3UNQbY/a22H2dK ItcYMrtixQwcDHnTZ+kgrlhkfT+IRMBy2pjl3HdYc0nuut6bJ2CRRyhJV+Xo9+53XjHo3j 4COAfrKB7+/jf7N0H/UbHh4zJiBz3/lsLPkA5cze4xqcPO4lP10+zAL9cUWRF8ug6/gig3 +vogIAJPjNdaxIxquhmM6lZeVNvF02UVZ/6Ka2r1ubpcF+ais1JB8xLMlQidy2qQIFmB5E BdHyz2eAOBP7qODeS2lgLe9X6r45SuhfyKLF7u+ACy8upoao7F0kLQ+wnSgW+A== 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 4YYgdk6f8mzVXV; Thu, 16 Jan 2025 11:30:18 +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 50GBUIVl048529; Thu, 16 Jan 2025 11:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GBUIoC048526; Thu, 16 Jan 2025 11:30:18 GMT (envelope-from git) Date: Thu, 16 Jan 2025 11:30:18 GMT Message-Id: <202501161130.50GBUIoC048526@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 3b9b3567e074 - 2025Q1 - misc/koboldcpp: Ignore portable flavor on arm64; Try again on 32-bit platforms 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 3b9b3567e074b37858d364d2ee0268df12cbab85 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b9b3567e074b37858d364d2ee0268df12cbab85 commit 3b9b3567e074b37858d364d2ee0268df12cbab85 Author: Yuri Victorovich AuthorDate: 2025-01-09 14:41:39 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-16 11:30:16 +0000 misc/koboldcpp: Ignore portable flavor on arm64; Try again on 32-bit platforms Reported by: fallout (portable flavor on arm64) (cherry picked from commit e2e9ddc21c7a1b3fcb06fd303a44fc2c3aebfb20) --- misc/koboldcpp/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index cdd40ee85550..a6254d6647b8 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -10,8 +10,8 @@ WWW= https://github.com/lostruins/koboldcpp LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN_armv7= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 -BROKEN_i386= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 +#BROKEN_armv7= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 +#BROKEN_i386= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 FLAVORS= default portable FLAVOR?= ${FLAVORS:[1]} @@ -66,4 +66,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${embd} ${STAGEDIR}${DATADIR} .endfor -.include +.include + +.if ${ARCH} == aarch64 && ${FLAVOR} == portable +IGNORE= portable flavor isn't defined on aarch64 because it is based on AVX2, etc. (?) +.endif + +.include