From nobody Tue Sep 13 17:14:28 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 4MRqnw30pwz4bvDP; Tue, 13 Sep 2022 17:14:28 +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 4MRqnw2Rtjz3Mlv; Tue, 13 Sep 2022 17:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089268; 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=aCIv2C2x8Aa1sdkVPtivJQcUsX6TWPsIoOd2v328+PU=; b=lnvz7surpktBjxl0aIiORexx+fnWZ1tU0U1c+SiGRX4HqgEM+c0Ji5/44Jv+FshH2wXk2t yvJDzwbM10VQfuwXbw9ZyV5EMjwMJtfw0tyW2TVusIxu6NwGMpNZddHipd0082+KJyhVR3 L7w+BdZoKjDNN6Gkf/NvEPqu2HPIDURdMwYf27SK2sF2f9YbK5T0SwznjFgEWvcJTK8bfi KQ5VlrPXkvk2Teu7VXveH2WHDebpZHHmpYA7noyLXNNqO7Du0Yig22QPhSv3PEr6gx2RgO mzuCnYGt6bJ0iL3pd/O2n1+MMcZcie8tj17Z4InJNrQra8bqrb2kVt1B4nmB2Q== 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 4MRqnw1Z0tzPSH; Tue, 13 Sep 2022 17:14:28 +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 28DHESBA023937; Tue, 13 Sep 2022 17:14:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DHESox023936; Tue, 13 Sep 2022 17:14:28 GMT (envelope-from git) Date: Tue, 13 Sep 2022 17:14:28 GMT Message-Id: <202209131714.28DHESox023936@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: 8e2c64a7e526 - main - devel/lua-language-server: fix build on powerpc* 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e2c64a7e526b5a475e624d4dfeafa42ddb5aca9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089268; 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=aCIv2C2x8Aa1sdkVPtivJQcUsX6TWPsIoOd2v328+PU=; b=YL3dbwHsUbori/jSiLx7WVmu42ZATB+ZkxKw/LNrd+9t/Xahv2HMIh3KcB6IqdO5fQhWsA 4dPSaMuKC3bAqOkLqtlWV9se2LuYFNmqlb6HfF6E7E3C6u+kZf+Uui0wk5qMfgiSidK0DH SyJWXsRuJ3xeCiB/KBOptp5MDutPuvhvSvXK4rdzyicfT40yoEISh8zt6P+FBGv2Wy3Ufj P7DrCI6C4AZjnV6nYt+TUhAXoZKefZIWRp8Uq2lG8BfVjHFHDYxgz3v4GXSZXdiWzHDQDY FrfJZcZ8c8pd86F+o8w67bXKko3mcjZPqt2xbfIxWO+JP3zsfUFDCLwkw9JMug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663089268; a=rsa-sha256; cv=none; b=KbsI0tx4KwieD9/IF5Y1g1kzGR5QHTTIyrgKvy/zAIgJ8w82HRV73rC3hNKWkLzVnzJUnN OsYBm1nbfTuGOAYZaHcwUHTN9ttCGOSEOnv4djSthYQVL2rDInMk/Fq6v+w+5kcEg8MuBY UZ62ai5fhrsm3nnwzuWgaCGEg3xrLTA8//5lQR/4jR2aptiBRLH8vJh/adok18bdsuzQBP Bi6xReoj6b0OTMl4o2dw3VRrQgduDNgPJ43P0kdE2o6BEvRAuFkdVH6Td6TxviH5ZLNSnU ar6d57B5wQM7PjZkClTuYg1RB8DFH1RDg+q3RbM8KbP95G6OmcSJs2LO0odbtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e2c64a7e526b5a475e624d4dfeafa42ddb5aca9 commit 8e2c64a7e526b5a475e624d4dfeafa42ddb5aca9 Author: Piotr Kubaj AuthorDate: 2022-09-13 17:04:46 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-13 17:04:46 +0000 devel/lua-language-server: fix build on powerpc* In file included from 3rd/bee.lua/binding/lua_thread.cpp:2: In file included from 3rd/bee.lua/bee/thread/lockqueue.h:5: 3rd/bee.lua/bee/thread/spinlock.h:22:6: error: unsupport platform #error unsupport platform ^ 3rd/bee.lua/bee/thread/spinlock.h:34:21: error: use of undeclared identifier 'cpu_relax' cpu_relax(); --- devel/lua-language-server/Makefile | 4 +++- .../files/patch-3rd_bee.lua_bee_thread_spinlock.h | 11 +++++++++++ .../files/patch-3rd_luamake_3rd_bee.lua_bee_thread_spinlock.h | 11 +++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile index 510e093dd175..79609c7dda8d 100644 --- a/devel/lua-language-server/Makefile +++ b/devel/lua-language-server/Makefile @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libinotify.so:devel/libinotify -USES= lua:build ninja:make +USES= dos2unix lua:build ninja:make USE_GITHUB= yes GH_ACCOUNT= sumneko GH_TUPLE= actboy168:bee.lua:301ad60:bee/3rd/bee.lua \ @@ -22,6 +22,8 @@ GH_TUPLE= actboy168:bee.lua:301ad60:bee/3rd/bee.lua \ sqmedeiros:lpeglabel:b5d7638:lpeglabel/3rd/lpeglabel BINARY_ALIAS= gcc=${CC} +DOS2UNIX_FILES= 3rd/bee.lua/bee/thread/spinlock.h \ + 3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h SUB_FILES= lua-language-server PLIST_FILES= bin/lua-language-server \ ${DATADIR_REL}/bin/lua-language-server \ diff --git a/devel/lua-language-server/files/patch-3rd_bee.lua_bee_thread_spinlock.h b/devel/lua-language-server/files/patch-3rd_bee.lua_bee_thread_spinlock.h new file mode 100644 index 000000000000..8c63fb448f7d --- /dev/null +++ b/devel/lua-language-server/files/patch-3rd_bee.lua_bee_thread_spinlock.h @@ -0,0 +1,11 @@ +--- 3rd/bee.lua/bee/thread/spinlock.h.orig 2022-09-13 00:54:42 UTC ++++ 3rd/bee.lua/bee/thread/spinlock.h +@@ -18,6 +18,8 @@ + asm volatile ("div %0, %0, zero" : "=r" (dummy)); + asm volatile ("" ::: "memory"); + }} ++#elif defined(__powerpc__) ++ namespace bee { inline void cpu_relax() { asm volatile("ori 0,0,0" ::: "memory"); }} + #else + #error unsupport platform + #endif diff --git a/devel/lua-language-server/files/patch-3rd_luamake_3rd_bee.lua_bee_thread_spinlock.h b/devel/lua-language-server/files/patch-3rd_luamake_3rd_bee.lua_bee_thread_spinlock.h new file mode 100644 index 000000000000..6ef12c62ee02 --- /dev/null +++ b/devel/lua-language-server/files/patch-3rd_luamake_3rd_bee.lua_bee_thread_spinlock.h @@ -0,0 +1,11 @@ +--- 3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h.orig 2022-09-13 00:54:31 UTC ++++ 3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h +@@ -18,6 +18,8 @@ + asm volatile ("div %0, %0, zero" : "=r" (dummy)); + asm volatile ("" ::: "memory"); + }} ++#elif defined(__powerpc__) ++ namespace bee { inline void cpu_relax() { asm volatile("ori 0,0,0" ::: "memory"); }} + #else + #error unsupport platform + #endif