From nobody Tue Jul 05 07:36:22 2022 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 CEF621D03F2B; Tue, 5 Jul 2022 07:36:22 +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 4LcZHB3wY4z3tlv; Tue, 5 Jul 2022 07:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657006582; 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=7Q25P8w5reNV4GdiynT4oOcYM0RMwei+gAzWJ6SOVHo=; b=NQte4tuMIxk0Z9/k5SE8RysU0jtWd2GwQiMF7j1s7WfhtY3WiB5qagSjcoPk1l7fW43inc Wb/jpATawhOOja5d+A2elYVriqDuiDnvh+d9R4c3gHpffAaXBNyiyEqlGliJZep2z3H3Dh Wc0Rsao7A/JNN2/kTW8nbKZ7nMGnat5w8uuHMrgMkKR4umBYcISnDmntfJ5LPaNsOzYBde 3YgXfDyHDpOWetSIARiK9qz2FEMXSKnSWr5k7yQVR5vIA06q0ZlmJBS0Nky4FmADhJ1/9i 8nCQe/c34JSZXB31AaOMqp60uaM1vglzvS1uKrBDr7lVjP7jscsyvKcwQvn2cQ== 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 669D92162B; Tue, 5 Jul 2022 07:36:22 +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 2657aMn3060492; Tue, 5 Jul 2022 07:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2657aMx4060491; Tue, 5 Jul 2022 07:36:22 GMT (envelope-from git) Date: Tue, 5 Jul 2022 07:36:22 GMT Message-Id: <202207050736.2657aMx4060491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 76c7602fdb82 - main - math/hpipm: Fix build on i386 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 76c7602fdb8216f6b10c957add54671111c27af0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657006582; 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=7Q25P8w5reNV4GdiynT4oOcYM0RMwei+gAzWJ6SOVHo=; b=xgGZIl5M5cvxqndxYy2Xu9QGh3qBTC4EhopSpeqJbg5uY5jFOc+sa/yzbZjltr4jENQfH9 7QYt3M/1AK7w8gGlnUsi2wTHQubt2vZdIqSHZFezcptXWSI0RLhmZqabohRLkngVto51/A /Xrh9ovrfQntcOhxSJO/saHhD8Fz70TFOCjAl5wbhtjEff+2jPAcdo3pRDJcjnecad7Keh Nuok96tJArlUKQpOEwSLSem2XB9aovCnL/5reLvl+qfnt0RkeH0+pnsky+6MWJ/5UfBjNA 4FSE9emQT5Ep9C4OnSVP/c7g4ew0YBxb4gc314kLiW55GJUI3M2Le3IsPtv97w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657006582; a=rsa-sha256; cv=none; b=CtD9AopIb4BaTUQFNGgvOhd8OF+h1C2Wj+Tg0zWdNdRVxijb1vZu6ZVTxdrp2j1jZEBu2G dW3yDZ72qE61782o1BoWsST1vo6SJoPEi8IcZU4Y8VQgfwEQXnX6/qnRrLURHzvtbKqbnz WTXLEt9s7gzjyCILtYvVNNT1SBkigCvGQYEufkjsTHLgK68XcmBlEEiofbDgJfAD59kIGc cElcHGU47fM1u/3msOmfvKP5VrLOS277bVkaLsInamu7sGyHchrNpNHzeKzLLmdfI/faxs tvJUVDuhLf+ceTlp+PAyvF/iu+5o0TNiwYivLKEsIaXF+IIaX62L/VSqw0bc2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=76c7602fdb8216f6b10c957add54671111c27af0 commit 76c7602fdb8216f6b10c957add54671111c27af0 Author: Yuri Victorovich AuthorDate: 2022-07-05 07:35:31 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-05 07:36:20 +0000 math/hpipm: Fix build on i386 ... by removing hardcoded -m64. Reported by: fallout --- 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")