) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761229342; 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=B/y7j3BK2PB3q6qe+Okb9E+C0BpKl/Xl2/esSY/VI9o=; b=mPG1sri2ctQdOxN31xBFlXADH6MGSRkg/39V8bMTQAeS7ZzpSlb3jFwWcWHeLZ0KXZSThs v1kJ+2xc+OwzwefjNmPppP9HtYBaDNAVxMfoLjlArRZhmPCVDveq3brDjvy19R33I9r310 z1Vzov5zP1sFGgGJDrz5ke2BDrGaZp6V0sI7BNaX34c0VseQVijNOgbdKEh/EkrkQgmD5r Yxz/I6mFFdJFNeSRWjYvVKwawziwHAsyEfphEptc2XZeINMTBGtkmRdqeqYJ0k3GOXzv00 fK8Gh6JFCpyAqS0IlmUj4ZFTiHVt+MpoBDR8XxXNMsmpEpO6h/HatlCD3eYgzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761229342; 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=B/y7j3BK2PB3q6qe+Okb9E+C0BpKl/Xl2/esSY/VI9o=; b=tRjOm4qzGa6bB2AupSeelRC+K287vli7nvLPlyRjjSw1f9vmwKBe7kiI0juK3BpfklwEU9 eawLgsM3mVyuarnD1EtSAa8cAN76L9krKjIQJqdgU4oCerFBmOwiTbU2BsvQ/zdey9kImr C4oppQd4bVcPEJFvnU3e2CYoUjh1CjryKQHshGMALiS9SjYaamdsKMk/+YJlJvyJmy6PAi +6z5nXizZECCduND2xKEkQNYLcNHUf8ynTzhWbK+SknCtW34nCqQpqhhjlbR+XKQJnw+8g D2wSZmlmAwP4x+0uiRqLtzEw+nl4T65dSDQrk5whjH53WzTSUvobYr8mDRp4cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761229342; a=rsa-sha256; cv=none; b=BUO4f39sSc4Y5Y7pHsWZ9YwfGIaMXmbzKuJoNcR9vBmbTbdUCEu5bIVhHnnJBeNXjsudTF lA/wfw+GkEy1qnWhoYJ3dVyf6SoQjIXCIgc5pWVxfqtGP1iF622b7yza/gx8u6+d2Wg3er KejwcC18MOvKAcyOTqf8yQS3sPFF/A7EyLMLMFApwRal3U9P/W8GppE0Tw4d0O/ea6TRUn wgnDBKxhQ7t5H2K7xo3Za4DRn+fvfoxItD8OFumizRE9lp84w/37+xw1Rj9HaVv4a24z3o M5mS4X7vcd1dbNQGcUoNhskd6ZfgrdaWLHNuJdpkotxD3RsD2Fui+e83aTthQQ== 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 4cspC21XMyz3k4; Thu, 23 Oct 2025 14:22:22 +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 59NEMMJY087239; Thu, 23 Oct 2025 14:22:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NEMM2k087236; Thu, 23 Oct 2025 14:22:22 GMT (envelope-from git) Date: Thu, 23 Oct 2025 14:22:22 GMT Message-Id: <202510231422.59NEMM2k087236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: d5e823497787 - main - misc/shimmy: fix build on powerpc64le 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5e8234977877e2446068da2de3605811c3df589 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5e8234977877e2446068da2de3605811c3df589 commit d5e8234977877e2446068da2de3605811c3df589 Author: Piotr Kubaj AuthorDate: 2025-10-23 14:07:19 +0000 Commit: Piotr Kubaj CommitDate: 2025-10-23 14:21:11 +0000 misc/shimmy: fix build on powerpc64le clang++: error: unknown argument: '-mpowerpc64' --- ...-0.1.123_llama.cpp_ggml_src_ggml-cpu_CMakeLists.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_llama.cpp_ggml_src_ggml-cpu_CMakeLists.txt b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_llama.cpp_ggml_src_ggml-cpu_CMakeLists.txt new file mode 100644 index 000000000000..10d472460f21 --- /dev/null +++ b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_llama.cpp_ggml_src_ggml-cpu_CMakeLists.txt @@ -0,0 +1,18 @@ +--- cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt.orig 2025-10-23 13:50:06 UTC ++++ cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt +@@ -388,13 +388,11 @@ function(ggml_add_cpu_backend_variant_impl tag_name) + string(REGEX REPLACE "POWER *([0-9]+)" "\\1" EXTRACTED_NUMBER "${MATCHED_STRING}") + + if (EXTRACTED_NUMBER GREATER_EQUAL 10) +- list(APPEND ARCH_FLAGS -mcpu=power10 -mpowerpc64) ++ list(APPEND ARCH_FLAGS -mcpu=power10) + elseif (EXTRACTED_NUMBER EQUAL 9) +- list(APPEND ARCH_FLAGS -mcpu=power9 -mpowerpc64) ++ list(APPEND ARCH_FLAGS -mcpu=power9) + elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le") + list(APPEND ARCH_FLAGS -mcpu=powerpc64le -mtune=native) +- else() +- list(APPEND ARCH_FLAGS -mcpu=native -mtune=native -mpowerpc64) + endif() + elseif(GGML_CPU_ALL_VARIANTS) + # Begin with the lowest baseline