summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bpftool/bpftool-6.9.2.ebuild4
-rw-r--r--dev-util/ccache/ccache-4.10-r1.ebuild (renamed from dev-util/ccache/ccache-4.10.ebuild)5
-rw-r--r--dev-util/ccache/files/ccache-4.10-blake3.patch79
-rw-r--r--dev-util/glade/glade-3.40.0-r1.ebuild4
-rw-r--r--dev-util/lua-language-server/Manifest1
-rw-r--r--dev-util/lua-language-server/files/build.ninja.patch19
-rw-r--r--dev-util/lua-language-server/files/build.ninja_v2.patch102
-rw-r--r--dev-util/lua-language-server/files/linux.ninja.patch33
-rw-r--r--dev-util/lua-language-server/files/linux.ninja_v2.patch71
-rw-r--r--dev-util/lua-language-server/lua-language-server-3.9.1-r1.ebuild (renamed from dev-util/lua-language-server/lua-language-server-3.7.3.ebuild)5
-rw-r--r--dev-util/lua-language-server/lua-language-server-3.9.1.ebuild88
-rw-r--r--dev-util/perf/perf-6.9.ebuild2
-rw-r--r--dev-util/wayland-scanner/Manifest1
-rw-r--r--dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild44
14 files changed, 153 insertions, 305 deletions
diff --git a/dev-util/bpftool/bpftool-6.9.2.ebuild b/dev-util/bpftool/bpftool-6.9.2.ebuild
index 1f63bf28f235..2b5f821c1188 100644
--- a/dev-util/bpftool/bpftool-6.9.2.ebuild
+++ b/dev-util/bpftool/bpftool-6.9.2.ebuild
@@ -52,8 +52,8 @@ CONFIG_CHECK="~DEBUG_INFO_BTF"
# it's building from the same tarball, please keep it in sync with perf
src_unpack() {
local paths=(
- tools/bpf kernel/bpf
- tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
+ kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+ scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
)
# We expect the tar implementation to support the -j and --wildcards option
diff --git a/dev-util/ccache/ccache-4.10.ebuild b/dev-util/ccache/ccache-4.10-r1.ebuild
index cf2714cb487b..a52907e3e3e0 100644
--- a/dev-util/ccache/ccache-4.10.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,17 +34,17 @@ fi
LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~riscv ~sparc ~x86"
# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
RESTRICT="!test? ( test )"
# TODO: package NonstdSpan, TlExpected
-# TODO: figure out why blake3 can't be found
# TODO: upstream httplib patch
DEPEND="
>=app-arch/zstd-1.3.4:=
>=dev-cpp/cpp-httplib-0.10.6:=
+ >=dev-libs/blake3-1.4.0:=
>=dev-libs/libfmt-8.0.0:=
>=dev-libs/xxhash-0.8.0
redis? ( >=dev-libs/hiredis-0.13.3:= )
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
"${FILESDIR}"/${PN}-4.10-unittest-httplib.patch
+ "${FILESDIR}"/${P}-blake3.patch
)
src_unpack() {
diff --git a/dev-util/ccache/files/ccache-4.10-blake3.patch b/dev-util/ccache/files/ccache-4.10-blake3.patch
new file mode 100644
index 000000000000..5789051200eb
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-blake3.patch
@@ -0,0 +1,79 @@
+https://github.com/ccache/ccache/pull/1464
+
+From d159306db8398da233df6481ac3fd83460ef0f0b Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:26:41 +0800
+Subject: [PATCH 1/4] Fix detection of system blake3
+
+The existing code mistakenly always rejects the system version as too old because it doesn't parse the version from the header correctly.
+
+This change fixes that.
+--- a/cmake/FindBlake3.cmake
++++ b/cmake/FindBlake3.cmake
+@@ -8,7 +8,7 @@ else()
+ find_library(BLAKE3_LIBRARY blake3)
+ if(BLAKE3_INCLUDE_DIR)
+ file(READ "${BLAKE3_INCLUDE_DIR}/blake3.h" _blake3_h)
+- string(REGEX MATCH "#define _blake3_version_string \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
++ string(REGEX MATCH "#define BLAKE3_VERSION_STRING \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
+ set(_blake3_version_string "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+ if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_blake3_version_string}" VERSION_GREATER_EQUAL "${Blake3_FIND_VERSION}")
+ if(BLAKE3_LIBRARY)
+
+From fa4046966e71011587364b0241255130b62858fb Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:43:11 +0800
+Subject: [PATCH 2/4] Fix blake3 include in Hash.hpp
+
+System installations of blake3 install the `blake3.h` header directly into the `include` directory and not into a `blake3` subdirectory.
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,7 +21,7 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+
+-#include <blake3/blake3.h>
++#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+
+
+From 36f8eeea1cb986440f51c1eee9db563493103462 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:44:53 +0800
+Subject: [PATCH 3/4] Fix include path for bundled blake3
+
+We modified the include directive for `blake3.h` in `Hash.hpp`, so we need this in order for builds that use the bundled blake3 to keep working.
+--- a/src/third_party/blake3/CMakeLists.txt
++++ b/src/third_party/blake3/CMakeLists.txt
+@@ -7,7 +7,7 @@ add_library(
+ "${CMAKE_CURRENT_SOURCE_DIR}/blake3/blake3_portable.c"
+ )
+
+-target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
++target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/blake3")
+ target_link_libraries(dep_blake3 PRIVATE standard_settings)
+
+ if(MSVC)
+
+From 8cc68bc6f3ec8dadcb6a1244c76d865536f91be7 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:52:59 +0800
+Subject: [PATCH 4/4] Fix `clang-format` failure
+
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,10 +21,11 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+
+-#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+
++#include <blake3.h>
++
+ #include <array>
+ #include <cstdint>
+ #include <cstdio>
+
diff --git a/dev-util/glade/glade-3.40.0-r1.ebuild b/dev-util/glade/glade-3.40.0-r1.ebuild
index 95dcadb511dc..1b0c994d79aa 100644
--- a/dev-util/glade/glade-3.40.0-r1.ebuild
+++ b/dev-util/glade/glade-3.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -59,7 +59,7 @@ PATCHES=(
)
pkg_setup() {
- python-single-r1_pkg_setup
+ use python && python-single-r1_pkg_setup
}
src_configure() {
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 7c1f24262397..0deeaf219a43 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,2 +1 @@
-DIST lua-language-server-3.7.3.zip 31522954 BLAKE2B 979f6de423d56b8781bfd3315d2d64cfe3082e3eecdf1203d7159d93f7bffa01f7330fe41c73949ece01fede8b987726cba54b884a07088d6ce6111802bede0a SHA512 db59d2987b09bb90fcdc362294d7b28b1652613414970856b54343c2a6ec791744dd524e505cb1495c0014c37288a8f5f5a849c64391a3e1a716bbe6788adcf2
DIST lua-language-server-3.9.1.zip 32595453 BLAKE2B 53e13639a6b60805c074b617c53503360388da3c6ee1c887845bff472dfea7048b5b8793968df068c747c925648feb3f851a2eca42c6a21e33b0f6242b1b80e7 SHA512 305b036d804d3864a0baecabf4cc9bf46f0bd9ffcf3cb5ced9f57b0b29b8d9231b7283970ef38bd1669be05da795f08627a56a5eb83a70d71e2768254cf497bc
diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index bb9891e2d04d..5485c318636d 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,4 +1,4 @@
---- a/build/build.ninja
+--- b/build/build.ninja
+++ b/build/build.ninja
@@ -14,7 +14,7 @@
make/code_format.lua
@@ -35,21 +35,12 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -87,7 +87,7 @@
- 3rd/bee.lua/binding/lua_time.cpp
+@@ -94,7 +94,7 @@
+ 3rd/bee.lua/binding/luaref.cpp
rule c_source_lua
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -95,7 +95,7 @@
- 3rd/bee.lua/3rd/lua/utf8_crt.c
- rule c_source_lua_1
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in
-+ -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in CFLAGS
+- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
++ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
diff --git a/dev-util/lua-language-server/files/build.ninja_v2.patch b/dev-util/lua-language-server/files/build.ninja_v2.patch
deleted file mode 100644
index 5485c318636d..000000000000
--- a/dev-util/lua-language-server/files/build.ninja_v2.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- b/build/build.ninja
-+++ b/build/build.ninja
-@@ -14,7 +14,7 @@
- make/code_format.lua
- rule c_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-- -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -22,14 +22,14 @@
- 3rd/bee.lua/3rd/lua-seri/lua-seri.c
- rule cxx_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
- build $obj/source_bee/format.obj: cxx_source_bee 3rd/bee.lua/3rd/fmt/format.cc
- rule cxx_source_bee_1
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -65,7 +65,7 @@
- rule cxx_source_bee_2
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $
-- -DNDEBUG -fPIC -o $out -c $in
-+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -94,7 +94,7 @@
- 3rd/bee.lua/binding/luaref.cpp
- rule c_source_lua
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
-+ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -104,7 +104,7 @@
- rule cxx_source_bootstrap
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
-- -DNDEBUG -fPIC -o $out -c $in
-+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -112,7 +112,7 @@
- 3rd/bee.lua/bootstrap/main.cpp
- rule link_bootstrap
- command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
-- -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
- description = Link Exe $out
- build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
- $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
-@@ -155,8 +155,8 @@
- -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
- -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
- -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $
-- -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
-- $out -c $in
-+ -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
-+ $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -259,7 +259,7 @@
- rule c_lpeglabel
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
-- -o $out -c $in
-+ -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -271,7 +271,7 @@
- rule cxx_lua_language_server
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
-- -DNDEBUG -o $out -c $in
-+ -DNDEBUG -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -279,7 +279,7 @@
- make/modules.cpp
- rule link_lua_language_server
- command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $
-- -lstdc++ -Wl,-Bdynamic -s
-+ -lstdc++ -Wl,-Bdynamic LDFLAGS
- description = Link Exe $out
- build $bin/lua-language-server: link_lua_language_server $
- $obj/lua-language-server/modules.obj $obj/lpeglabel/lplcap.obj $
diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index 4fedbaccc2dc..b4eba4b75e19 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -1,6 +1,6 @@
--- a/3rd/luamake/compile/ninja/linux.ninja
+++ b/3rd/luamake/compile/ninja/linux.ninja
-@@ -2,12 +2,12 @@
+@@ -2,12 +2,12 @@ ninja_required_version = 1.7
builddir = build/linux
bin = $builddir/bin
obj = $builddir/obj
@@ -16,7 +16,7 @@
description = Compile C $out
deps = gcc
depfile = $out.d
-@@ -15,14 +15,14 @@
+@@ -15,14 +15,14 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $
bee.lua/3rd/lua-seri/lua-seri.c
rule cxx_source_bee
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
@@ -33,7 +33,7 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 bee.lua/bee/version.cpp
rule cxx_source_bee_2
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $
@@ -42,30 +42,21 @@
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -80,14 +80,14 @@
+@@ -88,7 +88,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
rule c_source_lua
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-- description = Compile C $out
-+ description = Compile C $out CFLAGS
- deps = gcc
- depfile = $out.d
- build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
- rule c_source_lua_1
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in
+ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
- description = Compile C $out
+ description = Compile C $out CFLAGS
deps = gcc
depfile = $out.d
- build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
-@@ -95,15 +95,15 @@
- rule cxx_source_bootstrap
+ build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+@@ -97,14 +97,14 @@ rule cxx_source_bootstrap
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
-- -DNDEBUG -fPIC -o $out -c $in
-+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
+ -DNDEBUG -fPIC -o $out -c $in
+- description = Compile C++ $out
++ description = Compile C++ $out CXXFLAGS
deps = gcc
depfile = $out.d
build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
@@ -76,5 +67,5 @@
+ command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl $
+ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
description = Link Exe $out
- build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
- $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
+ rule copy
+ command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/files/linux.ninja_v2.patch b/dev-util/lua-language-server/files/linux.ninja_v2.patch
deleted file mode 100644
index b4eba4b75e19..000000000000
--- a/dev-util/lua-language-server/files/linux.ninja_v2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/3rd/luamake/compile/ninja/linux.ninja
-+++ b/3rd/luamake/compile/ninja/linux.ninja
-@@ -2,12 +2,12 @@ ninja_required_version = 1.7
- builddir = build/linux
- bin = $builddir/bin
- obj = $builddir/obj
--cc = gcc
--ar = ar
-+cc = REPLACE_ME
-+ar = REPLACE_AR
- luamake = luamake
- rule c_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-- -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
- description = Compile C $out
- deps = gcc
- depfile = $out.d
-@@ -15,14 +15,14 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $
- bee.lua/3rd/lua-seri/lua-seri.c
- rule cxx_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
- build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc
- rule cxx_source_bee_1
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-- -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
-+ -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -58,7 +58,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 bee.lua/bee/version.cpp
- rule cxx_source_bee_2
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $
-- -o $out -c $in
-+ -o $out -c $in CXXFLAGS
- description = Compile C++ $out
- deps = gcc
- depfile = $out.d
-@@ -88,7 +88,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
- rule c_source_lua
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
-- description = Compile C $out
-+ description = Compile C $out CFLAGS
- deps = gcc
- depfile = $out.d
- build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
-@@ -97,14 +97,14 @@ rule cxx_source_bootstrap
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
- -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
- -DNDEBUG -fPIC -o $out -c $in
-- description = Compile C++ $out
-+ description = Compile C++ $out CXXFLAGS
- deps = gcc
- depfile = $out.d
- build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
- bee.lua/bootstrap/main.cpp
- rule link_bootstrap
-- command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
-- -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+ command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl $
-+ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
- description = Link Exe $out
- rule copy
- command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild b/dev-util/lua-language-server/lua-language-server-3.9.1-r1.ebuild
index f251bf94fe57..bcd62d48de0f 100644
--- a/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.9.1-r1.ebuild
@@ -25,7 +25,10 @@ BDEPEND="
app-arch/unzip
"
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" )
+PATCHES=(
+ "${FILESDIR}/linux.ninja.patch"
+ "${FILESDIR}/build.ninja.patch"
+)
src_prepare() {
# Remove hardcoded gcc references
diff --git a/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild
deleted file mode 100644
index b02f0ae0859d..000000000000
--- a/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-inherit ninja-utils toolchain-funcs lua-single prefix
-
-DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/LuaLS/lua-language-server"
-SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRE_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="${LUA_DEPS}"
-RDEPEND="${DEPEND}"
-BDEPEND="
- app-alternatives/ninja
- app-arch/unzip
-"
-RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/linux.ninja.patch"
- "${FILESDIR}/build.ninja.patch"
-)
-
-src_prepare() {
- # Remove hardcoded gcc references
- sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
- make.lua || die
- sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
- 3rd/lpeglabel/makefile || die
- # Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
- eapply "${FILESDIR}/linux.ninja_v2.patch"
- eapply_user
- sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
- -e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
- -e "s/CFLAGS/${CFLAGS}/" \
- -e "s/CXXFLAGS/${CXXFLAGS}/" \
- -e "s/LDFLAGS/${LDFLAGS}/" \
- 3rd/luamake/compile/ninja/linux.ninja || die
-
- prefixify_ro "${FILESDIR}/wrapper.sh"
-}
-
-src_compile() {
- eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
- use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
- ./3rd/luamake/luamake init || die
-
- # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
- sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
- -e "s/^ar =.*./ar = REPLACE_AR/" \
- build/build.ninja || die
-
- eapply "${FILESDIR}/build.ninja_v2.patch"
- sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
- -e "s/REPLACE_AR/$(tc-getAR)/" \
- -e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
- -e "s/CFLAGS/${CFLAGS}/" \
- -e "s/CXXFLAGS/${CXXFLAGS}/" \
- -e "s/LDFLAGS/${LDFLAGS}/" \
- build/build.ninja || die
-
- use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
- rm -rf meta/198256b1
-}
-
-src_install() {
- newbin "${T}/wrapper.sh" ${PN}
-
- into /opt/${PN}
- dobin bin/${PN}
-
- insinto /opt/${PN}/bin
- doins bin/main.lua
-
- insinto /opt/${PN}
- doins -r debugger.lua main.lua locale meta script
-
- einstalldocs
-}
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
index b9cba4839efb..293e2b40b09d 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -140,7 +140,7 @@ pkg_setup() {
src_unpack() {
local paths=(
kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
- scripts include lib "arch/*/lib" "arch/*/tools"
+ scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
)
# We expect the tar implementation to support the -j option (both
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index e2de0f2c2836..95b73bb0bdfe 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1 +1,2 @@
DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
+DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
new file mode 100644
index 000000000000..bea0332f252f
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+ inherit git-r3
+else
+ SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ !<dev-libs/wayland-${PV}
+ >=dev-libs/expat-2.1.0-r3
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local emesonargs=(
+ -Ddocumentation=false
+ -Ddtd_validation=false
+ -Dlibraries=false
+ -Dscanner=true
+ -Dtests=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
+}
generated by cgit v1.3 (git 2.53.0) at 2026-10-14 01:15:02 +0000