From nobody Thu Apr 2 07:12:58 2026 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 4fmY3Y49gPz6WrkS for ; Thu, 02 Apr 2026 07:13:13 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmY3Y0Fkkz3mDR for ; Thu, 02 Apr 2026 07:13:13 +0000 (UTC) (envelope-from 6yearold@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-79a74765703so4265497b3.3 for ; Thu, 02 Apr 2026 00:13:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775113992; x=1775718792; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZHA+KLJXWhOQZoLBqWdKn8YbkcdUhQ1qhokyvdW7XW0=; b=D07+UB18OKbzIPsdmyzXFpyXK25jzoyuUo8SHN9CJpqIM5C9p4240jpQeGVkKE+lU/ NT3OyFt+Ga2Cyg/0mHHm9NE8FuFHtwRY0UAvcq+ZtsplLbVu/aW3bjSeIvVlczcyQjgL SfkxuByMFYXExHu4rp/l9nz2GSeMHVU/4Tjef6NYUhFKI/vRwq8jMXcCFq/34bxFojQz f+TnBL2hrPsihlwjleUjseGNZ4a4tVtDE87yEAGml+Ff4EesQg4Py8uZRVEbP86IkpZR ZaVyPhZPxblb8Ap+sVIkEWCo8mdpvSaSciYVjFlRGJ3fGLVH+gHgvLHdjiaOYVMCHD6F t1LA== X-Forwarded-Encrypted: i=1; AJvYcCUq3AqLbWvlao3yjNpFLdL4solLmKHXU+jJG0+lSvzbx2bexyC76LTUnVYZu5qbLBhHCQoP2SVcWpKmXvbr58H4OVH7VI7q@freebsd.org X-Gm-Message-State: AOJu0Yxyog3tPofRKQQn9cF9eyZIsXWdbdVwXdKpKApWhhIm9kr0FNQc RNsaSuj7Z0mk1Ung+wWWCR2UPR7vkKVb7VPkNIaBjb3JQh+XOHCrIa915KNcqqZ+O6Y= X-Gm-Gg: AeBDieviSg4h57Ef/zhVZP2EqaBryUmJ1FJNqumjJZVQN04M9GMU9UzmJyilCYEWDAU 1jpljuv31TUP5BnQe1/PqAU7v1C8VTZNJAXen0TEMcvdMuDE5S4Ch5RJx6jc+0EoaaPqRuZJkct Zl70SP2TssUJJWQT76/nsRFmGVoW9pJLQeK69pzJr+GC8tTcu6p9V4d9o/8SyhCAKFaC7YRABT8 tCjPBYgyTTIIchNXs1Tz7hmFpy2EnAqHD4Ar9w4egEJSI7Ofn8FQY7H2vBqFaQ4PgFirEJJ3Q3+ VcJTfsMjILw/0IjOWyl2XO3oQ0XAs/4x3UEVi+PgohuddbS9U4CqbjIMi8oVL5zQNCzuqShqxT6 bp4wSs6q1OekrmnaDoR71tHvSOQzcbp7LX6DsdgTk0HkniVQIh4PJTyzlINSaP2e7l7GgVWwUK5 z0GYAd6E92315SxMPctWpQl1QPsbkI8Exo1WWpkMQ2Z6dWy3kiJZewhWH6BiqFur45DleeP57XO H+s75l5eO7oSgtukWfwDzQEhEEk54TYi9hU6zEQjpBmGdJAaGd5W80N17R81cYMMh6/LPRwkHfQ e/zZX2qbd2AO3UtiUw== X-Received: by 2002:a05:690c:e689:b0:797:d5f2:c64 with SMTP id 00721157ae682-7a20fadc382mr45930657b3.10.1775113991725; Thu, 02 Apr 2026 00:13:11 -0700 (PDT) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com. [209.85.128.176]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7a36e830f12sm7848787b3.11.2026.04.02.00.13.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Apr 2026 00:13:11 -0700 (PDT) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-79ab5fd969aso5790617b3.0 for ; Thu, 02 Apr 2026 00:13:10 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXwwq9/9LPlozb4RtbQizHCn7hpszPAjgJuSYPNgtVyhZLrXLGj/7warmCFn1ldb1R0kdsc4RZqE2NYNCmU6AmxFSgflXc6@freebsd.org X-Received: by 2002:a05:690c:4806:b0:798:ff2f:2666 with SMTP id 00721157ae682-7a2101bbc64mr74448867b3.16.1775113990664; Thu, 02 Apr 2026 00:13:10 -0700 (PDT) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 References: <69ce1085.20cac.772d7539@gitrepo.freebsd.org> In-Reply-To: <69ce1085.20cac.772d7539@gitrepo.freebsd.org> From: Gleb Popov Date: Thu, 2 Apr 2026 09:12:58 +0200 X-Gmail-Original-Message-ID: X-Gm-Features: AQROBzA_-7GvVbQhNLvMyY6Hqi9Fixe8eTy6HQp44MkPssEPd2EBsKgH0BYD1wU Message-ID: Subject: Re: git: 097b8e780932 - main - misc/ollama: Fix package on non-x86 architectures To: Yuri Victorovich Cc: ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d97568064e74eea8" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4fmY3Y0Fkkz3mDR X-Spamd-Bar: ---- --000000000000d97568064e74eea8 Content-Type: text/plain; charset="UTF-8" On Thu, Apr 2, 2026, 08:45 Yuri Victorovich wrote: > The branch main has been updated by yuri: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=097b8e78093252bee1b7794095de394bb0729f52 > > commit 097b8e78093252bee1b7794095de394bb0729f52 > Author: Yuri Victorovich > AuthorDate: 2026-04-01 20:28:05 +0000 > Commit: Yuri Victorovich > CommitDate: 2026-04-02 06:45:22 +0000 > > misc/ollama: Fix package on non-x86 architectures > > x86-specific shared libs are excluded. > > Reported by: fallout > --- > misc/ollama/Makefile | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile > index 88dfe4931b8a..931a55926ef5 100644 > --- a/misc/ollama/Makefile > +++ b/misc/ollama/Makefile > @@ -34,20 +34,24 @@ JSON_VERSION= 3.11.3 > PLIST_FILES= bin/${PORTNAME} \ > bin/ollama-limit-gpu-layers > > +XARCH!= uname -p > + > Why not use canonical ${ARCH} ? OPTIONS_GROUP= BACKENDS > OPTIONS_GROUP_BACKENDS= CPU VULKAN MLX > OPTIONS_DEFAULT= CPU VULKAN MLX > > CPU_DESC= Build CPU backend shared libraries for various > SIMD instruction sets > CPU_PLIST_FILES= lib/ollama/libggml-base.so \ > - lib/ollama/libggml-base.so.0 \ > - lib/ollama/libggml-cpu-alderlake.so \ > + lib/ollama/libggml-base.so.0 > +.if ${XARCH} == "amd64" || ${XARCH} == "i386" > +CPU_PLIST_FILES+= lib/ollama/libggml-cpu-alderlake.so \ > lib/ollama/libggml-cpu-haswell.so \ > lib/ollama/libggml-cpu-icelake.so \ > lib/ollama/libggml-cpu-sandybridge.so \ > lib/ollama/libggml-cpu-skylakex.so \ > lib/ollama/libggml-cpu-sse42.so \ > lib/ollama/libggml-cpu-x64.so > +.endif > > VULKAN_DESC= Build Vulkan GPU backend shared library > VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ > > --000000000000d97568064e74eea8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Apr 2, 2026, 08:45 Yuri = Victorovich <yuri@freebsd.org>= ; wrote:
The branch main has been u= pdated by yuri:

URL: = https://cgit.FreeBSD.org/ports/commit/?id=3D097b8e78093252bee1b7794095de394= bb0729f52

commit 097b8e78093252bee1b7794095de394bb0729f52
Author:=C2=A0 =C2=A0 =C2=A0Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-04-01 20:28:05 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-04-02 06:45:22 +0000

=C2=A0 =C2=A0 misc/ollama: Fix package on non-x86 architectures

=C2=A0 =C2=A0 x86-specific shared libs are excluded.

=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 fallout
---
=C2=A0misc/ollama/Makefile | 8 ++++++--
=C2=A01 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile
index 88dfe4931b8a..931a55926ef5 100644
--- a/misc/ollama/Makefile
+++ b/misc/ollama/Makefile
@@ -34,20 +34,24 @@ JSON_VERSION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A03.11.3
=C2=A0PLIST_FILES=3D=C2=A0 =C2=A0bin/${PORTNAME} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bin/ollama-limit-gp= u-layers

+XARCH!=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uname -p<= br> +

Why not use canonical ${ARCH} ?

=C2=A0OPTIONS_GROUP=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0BACKENDS
=C2=A0OPTIONS_GROUP_BACKENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 CPU VULKAN MLX =C2=A0OPTIONS_DEFAULT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0CPU VULKAN MLX

=C2=A0CPU_DESC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Build CPU= backend shared libraries for various SIMD instruction sets
=C2=A0CPU_PLIST_FILES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/ollama/libggml-base.= so \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0lib/ollama/libggml-base.so.0 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0lib/ollama/libggml-cpu-alderlake.so \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0lib/ollama/libggml-base.so.0
+.if ${XARCH} =3D=3D "amd64" || ${XARCH} =3D=3D "i386"<= br> +CPU_PLIST_FILES+=3D=C2=A0 =C2=A0 =C2=A0 lib/ollama/libggml-cpu-alderlake.s= o \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-haswell.so \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-icelake.so \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-sandybridge.so \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-skylakex.so \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-sse42.so \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 lib/ollama/libggml-cpu-x64.so
+.endif

=C2=A0VULKAN_DESC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Build Vulkan G= PU backend shared library
=C2=A0VULKAN_BUILD_DEPENDS=3D=C2=A0 glslc:graphics/shaderc \

--000000000000d97568064e74eea8--