From nobody Tue Jul 5 07:37:44 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 543CE1D03DFD; Tue, 5 Jul 2022 07:37:44 +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 4LcZJm1wFcz3tvh; Tue, 5 Jul 2022 07:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657006664; 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=16OaqVXGBkRaUAuyWxPyBc+300VPOFBfUGF1yvck7bg=; b=S7nhbcuQ9Us4OD+sPkmPtyu1zlI7fyC2Ro7RKjRWiAYkzXiIvg4c09uo1HISkKJWqrdtxf CQXfqx7hIbT464FO/v5YUP9Rg0lZVsLbJGTtiB7pWFJmLWsb26IvRnHJEaViVDHBsoFlsp SDp0ULEkgpvkdYI9yNghvSei1u0wMXONrytbxcv12BWUs5sjok3UbkDyAvb4Emt8ffNtEv y/fvThOeGJYGfSEPaD068d6PIsmCwANRSsB8/fsxPYINb/niU7L6T0DkzVUd2ntgCKGOMS En4v3qiMgud+5w0kDSZ9hX45NeMFe2Cg3t2gdMdsN9yoPuBy0zUzWNR2VdxRlg== 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 2190220F7A; Tue, 5 Jul 2022 07:37:44 +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 2657bif2060709; Tue, 5 Jul 2022 07:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2657bi7P060708; Tue, 5 Jul 2022 07:37:44 GMT (envelope-from git) Date: Tue, 5 Jul 2022 07:37:44 GMT Message-Id: <202207050737.2657bi7P060708@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: 6bbd7896410c - 2022Q3 - math/hpipm: Fix build on i386 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: 6bbd7896410cec76cd9f723b1ccd388a57cbe88b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657006664; 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=16OaqVXGBkRaUAuyWxPyBc+300VPOFBfUGF1yvck7bg=; b=JolHCdjvZznx8rSQ7Vv3CQK4StNNcUv7jMb5u0XSQazNEXyE/jfW8dAyMcW6O+vIvhzM31 UNOJ/RdPATeYblMcpOxuzeqAKQr1RptOCP41HtzLbgpLBF1wOMaWQscefuu4X4X3OAqevA nJnpFhSMZLYiqw38BhJaWw8lSBNDxfkMB+96N9WdDjF++hsKDj123hnpJdJDyYX6Js/tW0 poiJhzUxHo9CFwDXzsBlMw01jTwLK/DmZBsy3bWDeql/YONqOxqEzCsBdaV0690LnORoqh fjpNHTB51T8SSiGcG9nXsS83hPKZvCuY6RXd+J+a9G/Hf8bKM72mjilrgGxWrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657006664; a=rsa-sha256; cv=none; b=nejo5ZS/1VaIOxJ+ibW8ouySHMVQKanHpbhh9tSjM+Rjy7JIpCdGSawhYhbRa75nsT0tCk wR/K5wYSDhwo/7Y0vqpd8LYi84kVqsn6MBYRk9HZlqpzjFYIZzY77azsruoXyY5WVdbHfz Q+73QqsInZZUcHAVoArOirxOp1S4vtR0tJ9NjTVumMPjHZngn5Q8H6UJgG1Bq3FAxEOX0v axyDoDX29JiVPqnmxA/Tzlduash4UEWZQ5+q2zRG8q+SP5DeFcfdPxDVhHq2TDOA428ICN IWj2Yp/hKp+rYxuCjhWHFLm7Hd9M33TT9tFRq3AX+ER/rDk2FisAWcPgeO1Avg== 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=6bbd7896410cec76cd9f723b1ccd388a57cbe88b commit 6bbd7896410cec76cd9f723b1ccd388a57cbe88b Author: Yuri Victorovich AuthorDate: 2022-07-05 07:35:31 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-05 07:37:41 +0000 math/hpipm: Fix build on i386 ... by removing hardcoded -m64. Reported by: fallout (cherry picked from commit 76c7602fdb8216f6b10c957add54671111c27af0) --- math/hpipm/files/patch-CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt index 5223658667cb..3f86ec49de06 100644 --- a/math/hpipm/files/patch-CMakeLists.txt +++ b/math/hpipm/files/patch-CMakeLists.txt @@ -18,6 +18,15 @@ if(BUILD_SHARED_LIBS MATCHES OFF) set(HPIPM_BLASFEO_LIB "Static" CACHE STRING "BLASFEO library link type") else() +@@ -140,7 +140,7 @@ endif() + if(${TARGET} MATCHES AVX) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_AVX") + if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mavx") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx") + endif() + elseif(${TARGET} MATCHES GENERIC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_GENERIC") @@ -151,7 +151,7 @@ if(${REF_BLAS} MATCHES 0) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ") endif(${REF_BLAS} MATCHES 0) @@ -32,7 +41,7 @@ endif(${REF_BLAS} MATCHES NETLIB) if(${REF_BLAS} MATCHES MKL) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64 -I/opt/intel/mkl/include") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL") endif(${REF_BLAS} MATCHES MKL) if(${REF_BLAS} MATCHES ATLAS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_ATLAS")