From nobody Wed Sep 14 08:48:42 2022 X-Original-To: dev-commits-ports-branches@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 4MSDWt3zMVz4ckb3; Wed, 14 Sep 2022 08:48:42 +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 4MSDWt3VpLz3WKW; Wed, 14 Sep 2022 08:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663145322; 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=wF9tmfiPEnDZFcqcfdzXG2KditRlXSn52tk9ZAvKwlU=; b=LcbhhXQfnh5YwDsspw/B5dKSuYxYKivuAu1+n+lddXFMWoKflQDpY7376NKWvtsAqFcUUp vRKlEsANQAVtHYWXKAFTg6V8ZKwgtA84GQs/O1fWc81et2mOb8li/ScOz29SJrQyGLjPKM QonS5mKLua44WTlG84HZrHyepPhWTBPTNZR1nvtgDOiWqnw+J8jOG1t2WXwKIxxdjYmLZO Xhtx0YSskmrZQ5t1HOOvfs4CpRoGevCIU1wE0tCXEo87jl4Z+JI2T5ELunC3ULNxmN3iia /1XAKsM0e31XYG6biRtxK7/13xCOc89wlqxWgf87IvywjWJ8znYm6X6eTsrU7w== 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 4MSDWt2Tvvzcxm; Wed, 14 Sep 2022 08:48:42 +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 28E8mgNB078855; Wed, 14 Sep 2022 08:48:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28E8mgYF078854; Wed, 14 Sep 2022 08:48:42 GMT (envelope-from git) Date: Wed, 14 Sep 2022 08:48:42 GMT Message-Id: <202209140848.28E8mgYF078854@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: 5dde230a5aa6 - 2022Q3 - math/clfft: Unbreak by fixing C++ error List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 5dde230a5aa60db57a40f762ea61eb978cb5bb92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663145322; 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=wF9tmfiPEnDZFcqcfdzXG2KditRlXSn52tk9ZAvKwlU=; b=fe6Slz7LR12yqUyCZir5wJL9IrdVMZ5Xy/dz8HA1Ph3VECAe+tx6d1XysGjEzUii7wfnyM JwGoCnjntxNP86ZVy6yA0yUUT6HbBNbcVrYkYevoScwsb05OOZYWgikfyok09gB8rJzitB vZnNANBAhTbV2qGd7nAIzDRBXZEHmaIiTTtKQ2Z9i3mQ1FaLjO/lOqWz3qBrKjYnEzSaLC 2NSRpAnmFNNNWrNiiBAmfJXSMsCQGsFqesE525zDyhiGoPY97kA3NIs/ujEDmWwHIkAUO8 gUu1MPXQlERzvRa8bT5LdGePnd2N7KEI3ho+wZpbqW9uGwr59EhOE0/BGRrVZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663145322; a=rsa-sha256; cv=none; b=WtHyoWdZ62BRVNzoWChJ+BlcX+2yzsLpviRQ5g9gM8H8fQE9326SsOYJ8t39+6VPlJhj4I Ipj//d4BSKl0uehtpErrS4USxmJoQuKUPK4e01KfcVi072gkA4SSGG4Vhdbx4aOs6gZ+ia hQKLQ8Ml4H+BAt/G8F3TsaJEqd2F94clOUPxWnrcltITxbIOUDZWinRdtA59awJh7PdMbL Ss3PU5qDp15gSOhfKRyebJu7Fg9GDFQc4FF7E6FAkCSxpPNP0jCR/mHA9tGPodnP+tnuUS MJRrtnXAkOVQgVQhZMqtpFCY2ZQGJsx1+BA4Sva4Cv/451WHY8RGa4VZoS1wjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dde230a5aa60db57a40f762ea61eb978cb5bb92 commit 5dde230a5aa60db57a40f762ea61eb978cb5bb92 Author: Yuri Victorovich AuthorDate: 2022-09-14 08:43:08 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-14 08:48:39 +0000 math/clfft: Unbreak by fixing C++ error Approved by: portmgr (unbreak) (cherry picked from commit 561d1faa6155aea59e9acd196f9171e5dcdd5e64) --- .../files/patch-src_library_generator.transpose.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/math/clfft/files/patch-src_library_generator.transpose.cpp b/math/clfft/files/patch-src_library_generator.transpose.cpp new file mode 100644 index 000000000000..e17a58968168 --- /dev/null +++ b/math/clfft/files/patch-src_library_generator.transpose.cpp @@ -0,0 +1,16 @@ +- fix C++ error + +--- src/library/generator.transpose.cpp.orig 2016-08-31 21:46:51 UTC ++++ src/library/generator.transpose.cpp +@@ -1089,8 +1089,9 @@ clfftStatus genSwapKernelGeneral(const FFTGeneratedTra + + //std::string funcName = "swap_nonsquare_" + std::to_string(smaller_dim) + "_" + std::to_string(dim_ratio); + std::string funcName = "swap_nonsquare_"; +- std::string smaller_dim_str = static_cast(&(std::ostringstream() << smaller_dim))->str(); +- std::string dim_ratio_str = static_cast(&(std::ostringstream() << dim_ratio))->str(); ++ std::ostringstream ss1, ss2; ++ std::string smaller_dim_str = (ss1 << smaller_dim, ss1.str()); ++ std::string dim_ratio_str = (ss2 << dim_ratio, ss2.str()); + if(params.fft_N[0] > params.fft_N[1]) + funcName = funcName + smaller_dim_str + "_" + dim_ratio_str; + else