From nobody Thu Mar 9 09:49:34 2023 X-Original-To: dev-commits-ports-all@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 4PXPXt4b8kz3wSmJ; Thu, 9 Mar 2023 09:49:34 +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 4PXPXt3gZfz4YFG; Thu, 9 Mar 2023 09:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355374; 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=ngdzR6OMN9lnYkT5HXW0gDrspnD9e5RR86yx3qKmJPI=; b=LW45U+BaWaRPWPLFDLIxliaKujOxjoBiwo7xobld2j3MmTYz34gn4jpsPj1kZG13qufCaZ OpOaRNwS7IwP1TGVi/wLzjYNehBno/tWz8gcPpsxWXMdfAA0sN0zPL4DArf5LLdj8NEETJ 4HRuymCg+KBcm9/Nc+619rz4JVKbXp4zJUS12ocugtf0Wj2kErcG8rErlAR8TCn65rGYBA cZh2KhMUYnSN6HyPiB1jkCKnOW+Je0/bFRUWXALb8VLx7ytzQWyuWaX7n3qRGjyeSZ2Xf+ GUm7kz8bDTPM7VxQlDSCBh9JlO3xslmRHFy0lPHzOkV1F4JhkTO/6L3pT7eI+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355374; 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=ngdzR6OMN9lnYkT5HXW0gDrspnD9e5RR86yx3qKmJPI=; b=W+HR/g21dajfxU0uYNzlt31bFF/Vtj+NRq7WjI/WlGKGseMyhBB3fq2vjsEa1ML7mVnUAL GhGVmOeXFIeoqfhFLkSq6jJZQxOLNkdfswQCNRZq+aLMA2jieuD+mNmfksyg5RoZSBq7Hi 0vSgdDpHKM5LPT+d40v4GeyZuybCeer4rGn22ZeSinW88DS2B0nhsIYk1CAiX9I5NmCwtN yK2Dp1LBP/1YP7zc/jo6/8KQzBox/qFUuBS7Y0f4fPJzest8PtWj7GQecL2ZJgQ3FV7Ruu eCRMCPRWgEYtlqcIOCFVNZcyMwAyIvU3R2psCCrNnFP5GwcIebQcKdMU1qGyhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678355374; a=rsa-sha256; cv=none; b=Fxqzf22ANOSb6S36zNn2N3/kyYin3rw+k7rGgbKnnUdwntHNvoESceYV1/Vb9bIYQ00zWf fw++0KC8ZgN0CU0ttYeX7c6ixNk8Kw8rXZ5ieH8iSO8OCE6tImfKjTXOQ/qcwn8sowMf9E nrcMxAkR8SurKzJUZG2RLjicZuBQHDjfBRFmhF6v7xET/eVuQnNaTf4tPCkuRdWOE8eE1o lWOzhH4MaXw73EH4veGBZ0ILqOvCdx2aMNygQnwDEfbZ0na77Gtx9NG7Pnuqq2iI4lhnsT za2cQvyqYeNosWMCNBUgXyX+aJdYM1TyU/v6M4X1Jvpz1epA4r/0Hoo4Jbc/8A== 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 4PXPXt2k8qz134W; Thu, 9 Mar 2023 09:49:34 +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 3299nYIp056746; Thu, 9 Mar 2023 09:49:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3299nYfx056745; Thu, 9 Mar 2023 09:49:34 GMT (envelope-from git) Date: Thu, 9 Mar 2023 09:49:34 GMT Message-Id: <202303090949.3299nYfx056745@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: 56f8ca40ae4e - main - sysutils/fluent-bit: fix build on powerpc* 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 56f8ca40ae4e185df5a6a022f60bfce787fd7112 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=56f8ca40ae4e185df5a6a022f60bfce787fd7112 commit 56f8ca40ae4e185df5a6a022f60bfce787fd7112 Author: Piotr Kubaj AuthorDate: 2023-03-09 09:49:11 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-09 09:49:11 +0000 sysutils/fluent-bit: fix build on powerpc* /wrkdirs/usr/ports/sysutils/fluent-bit/work/fluent-bit-2.0.9/lib/wasm-micro-runtime-WAMR-1.1.1/core/iwasm/common/arch/invokeNative_em64.s:63:5: error: invalid instruction, did you mean: crset, fre? ret --- .../files/patch-src_wamrc_CMakeLists.txt | 27 ++++++++++++++++++++++ .../fluent-bit/files/patch-src_wasm_CMakeLists.txt | 20 ++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/sysutils/fluent-bit/files/patch-src_wamrc_CMakeLists.txt b/sysutils/fluent-bit/files/patch-src_wamrc_CMakeLists.txt new file mode 100644 index 000000000000..c21901077dd1 --- /dev/null +++ b/sysutils/fluent-bit/files/patch-src_wamrc_CMakeLists.txt @@ -0,0 +1,27 @@ +--- src/wamrc/CMakeLists.txt.orig 2023-03-09 08:46:55 UTC ++++ src/wamrc/CMakeLists.txt +@@ -32,14 +32,14 @@ if (NOT DEFINED WAMR_BUILD_TARGET) + set (WAMR_BUILD_TARGET "ARM") + elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") + set (WAMR_BUILD_TARGET "RISCV64") +- elseif (CMAKE_SIZEOF_VOID_P EQUAL 8) ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64") + # Build as X86_64 by default in 64-bit platform + set (WAMR_BUILD_TARGET "X86_64") +- elseif (CMAKE_SIZEOF_VOID_P EQUAL 4) ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86") + # Build as X86_32 by default in 32-bit platform + set (WAMR_BUILD_TARGET "X86_32") + else () +- message(SEND_ERROR "Unsupported build target platform!") ++ set(WAMR_BUILD_INVOKE_NATIVE_GENERAL 1) + endif () + endif () + +@@ -201,4 +201,4 @@ if (LLVM_FOUND) + endif() + else() + message(STATUS "LLVM is not found. WAMRC won't be built.") +-endif () +\ No newline at end of file ++endif () diff --git a/sysutils/fluent-bit/files/patch-src_wasm_CMakeLists.txt b/sysutils/fluent-bit/files/patch-src_wasm_CMakeLists.txt new file mode 100644 index 000000000000..e173a8cabc6a --- /dev/null +++ b/sysutils/fluent-bit/files/patch-src_wasm_CMakeLists.txt @@ -0,0 +1,20 @@ +--- src/wasm/CMakeLists.txt.orig 2023-03-08 22:58:52 UTC ++++ src/wasm/CMakeLists.txt +@@ -30,14 +30,14 @@ if (NOT DEFINED WAMR_BUILD_TARGET) + set (WAMR_BUILD_TARGET "ARM") + elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") + set (WAMR_BUILD_TARGET "RISCV64") +- elseif (CMAKE_SIZEOF_VOID_P EQUAL 8) ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64") + # Build as X86_64 by default in 64-bit platform + set (WAMR_BUILD_TARGET "X86_64") +- elseif (CMAKE_SIZEOF_VOID_P EQUAL 4) ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86") + # Build as X86_32 by default in 32-bit platform + set (WAMR_BUILD_TARGET "X86_32") + else () +- message(SEND_ERROR "Unsupported build target platform!") ++ set(WAMR_BUILD_INVOKE_NATIVE_GENERAL 1) + endif () + endif () +