diff options
| author | root <root@alpha.trunkmasters.com> | 2026-08-11 03:04:37 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-08-11 03:04:37 -0500 |
| commit | ba90b749802640220d8dabc00ab63881741a230e (patch) | |
| tree | 181a6ca9c09dc17e70de01dee8ffce26d60609e3 /dev-lang | |
| parent | 1160c54c5acbfd332d8757e926627ae58c982459 (diff) | |
| download | baldeagleos-repo-ba90b749802640220d8dabc00ab63881741a230e.tar.gz baldeagleos-repo-ba90b749802640220d8dabc00ab63881741a230e.tar.xz baldeagleos-repo-ba90b749802640220d8dabc00ab63881741a230e.zip | |
Adding metadata
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/elixir/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.20.2.ebuild | 43 | ||||
| -rw-r--r-- | dev-lang/php/files/php-set-fpm-test-executable.patch | 26 | ||||
| -rw-r--r-- | dev-lang/php/php-8.4.24.ebuild | 14 | ||||
| -rw-r--r-- | dev-lang/php/php-8.5.9.ebuild | 14 | ||||
| -rw-r--r-- | dev-lang/zig/files/zig-9999-fix-install-prefix.patch | 82 | ||||
| -rw-r--r-- | dev-lang/zig/zig-9999.ebuild | 4 |
7 files changed, 92 insertions, 92 deletions
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 9f13cc742b2f..8e79110e223d 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -3,3 +3,4 @@ DIST elixir-1.17.3.tar.gz 3256595 BLAKE2B c016857f74d65de5afcef6d1284b76fc529a54 DIST elixir-1.18.4.tar.gz 3397219 BLAKE2B 9c1052eaa3e17366c6f42296c1e9ae6cc9a6419dd9916d9badcdcf7f999d2e6cbbed840261f86e7d8bf3839d5a1d4bff9633aa87264d03bc08ca8c50fcb4afac SHA512 14030fbfaf7dcd88cf60d1cee52a6316e2298c8dcf7b41d758456c01e98f45499d8590beab3ac8683d613ddb17f9c92988c76081ab9f316b9c890c482a26c8eb DIST elixir-1.19.5.tar.gz 3593898 BLAKE2B 86ca979ff6f698c581f864652fe8414c69e30d17295b3e20c5c625b75f213f7af77225c79e003c9ef6c74ad21b909942fdcc885977401d46a8a5a3b86765f355 SHA512 6bdc83490fb44daead69f86dee08f25a3c0c23bc46be6f62e3603777f3ffa6be4334904689782b0990640d50385dc90ec1d16cbfaf5691ec405ee2c88ff3c4ac DIST elixir-1.20.1.tar.gz 3675171 BLAKE2B b510522c34d1892dd34b452bf7e771c4a73b31280b42634422b7471aa44ff34432fc054a125b4258e1d365fb3080daa3d5461ab537aa993a3cd7ca6bdb555834 SHA512 7e4f4342f154f5c6bce80247a7ca66ed1b538df977183295c8350339ffd9173cc5be3fc8902d07bad27d4433a9b47b5345180eb9fe72e68ae87824da55a82012 +DIST elixir-1.20.2.tar.gz 3678960 BLAKE2B 7373e2763526cbc6e4986a27c2ac8ce8b98cb0683a99d54227dc03dab847647f24ba4e4bbd546e87ab0155ae5b5fea53ec641ad55da1b834301582e7c05a32c4 SHA512 13c5d6df99e83ac675df1b68d7b6b7ec05bf63303674058e26e170ddc506c84f233abee2175d2d0e4d7bc27238cc7b576b02dd766bb3ac595ca368f566e145ae diff --git a/dev-lang/elixir/elixir-1.20.2.ebuild b/dev-lang/elixir/elixir-1.20.2.ebuild new file mode 100644 index 000000000000..591ae0075e90 --- /dev/null +++ b/dev-lang/elixir/elixir-1.20.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=9 + +DESCRIPTION="Elixir programming language" +HOMEPAGE="https://elixir-lang.org" +SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 ErlPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +# https://hexdocs.pm/elixir/compatibility-and-deprecations.html#between-elixir-and-erlang-otp +DEPEND=" + >=dev-lang/erlang-27:0=[ssl] + <dev-lang/erlang-30 +" +# 'mix' tool collides with sci-biology/phylip, bug #537514 +RDEPEND="${DEPEND} + !!sci-biology/phylip +" +DEPEND+=" + test? ( dev-vcs/git ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch + "${FILESDIR}"/${PN}-1.10.3-no-Q.patch + "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch +) + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install + dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md +} + +# Note on tests: Needs to be ran with proper isolation when epmd is already running on the host, +# say with ebuild launched by root, or emerge +# See: https://github.com/elixir-lang/elixir/issues/14889#issuecomment-3539477959 diff --git a/dev-lang/php/files/php-set-fpm-test-executable.patch b/dev-lang/php/files/php-set-fpm-test-executable.patch new file mode 100644 index 000000000000..727a7c4f4824 --- /dev/null +++ b/dev-lang/php/files/php-set-fpm-test-executable.patch @@ -0,0 +1,26 @@ +commit 37b570017659468c3b450067b0c4224b7849b395 +Author: Lothar Serra Mari <mail@serra.me> +Date: Thu Aug 6 14:07:33 2026 +0200 + + tests: Allow overriding TEST_PHP_EXECUTABLE for FPM SAPI + + The test suite derives the path to php-fpm from TEST_PHP_EXECUTABLE. + This fails on custom build directory layouts, leading to skipping all + php-fpm related tests. + + Users can provide TEST_PHP_FPM_EXECUTABLE for a custom binary path; if + this is unset, we'll fall back to TEST_PHP_EXECUTABLE instead. + +diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc +index 9079886543..557f8c25e1 100644 +--- a/sapi/fpm/tests/tester.inc ++++ b/sapi/fpm/tests/tester.inc +@@ -225,7 +225,7 @@ class Tester + */ + static public function findExecutable(): bool|string + { +- $phpPath = getenv("TEST_PHP_EXECUTABLE"); ++ $phpPath = getenv("TEST_PHP_FPM_EXECUTABLE") ?: getenv("TEST_PHP_EXECUTABLE"); + for ($i = 0; $i < 2; $i++) { + $slashPosition = strrpos($phpPath, "/"); + if ($slashPosition) { diff --git a/dev-lang/php/php-8.4.24.ebuild b/dev-lang/php/php-8.4.24.ebuild index 5b44e63cab7f..9938f235d935 100644 --- a/dev-lang/php/php-8.4.24.ebuild +++ b/dev-lang/php/php-8.4.24.ebuild @@ -135,6 +135,7 @@ DEPEND="${COMMON_DEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( + "${FILESDIR}/php-set-fpm-test-executable.patch" "${FILESDIR}/php-8.3.31-ipv6-printing-test-fix.patch" ) @@ -717,7 +718,7 @@ src_install() { } src_test() { - export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" + local TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" # Sometimes when the sub-php launches a sub-sub-php, it uses these. # Without an "-n" in all instances, the *live* php.ini can be loaded, @@ -726,11 +727,18 @@ src_test() { export TEST_PHP_EXTRA_ARGS="-n" if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + local TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + export TEST_PHP_CGI_EXECUTABLE + fi + + if [[ -x "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm" ]] ; then + local TEST_PHP_FPM_EXECUTABLE="${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm" + export TEST_PHP_FPM_EXECUTABLE fi if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + local TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + export TEST_PHPDBG_EXECUTABLE fi # The IO capture tests need to be disabled because they fail when diff --git a/dev-lang/php/php-8.5.9.ebuild b/dev-lang/php/php-8.5.9.ebuild index 7da84a0ec5cc..b978c961e19c 100644 --- a/dev-lang/php/php-8.5.9.ebuild +++ b/dev-lang/php/php-8.5.9.ebuild @@ -136,6 +136,7 @@ DEPEND="${COMMON_DEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( + "${FILESDIR}/php-set-fpm-test-executable.patch" "${FILESDIR}/php-8.3.31-ipv6-printing-test-fix.patch" ) @@ -716,7 +717,7 @@ src_install() { } src_test() { - export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" + local TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" # Sometimes when the sub-php launches a sub-sub-php, it uses these. # Without an "-n" in all instances, the *live* php.ini can be loaded, @@ -725,11 +726,18 @@ src_test() { export TEST_PHP_EXTRA_ARGS="-n" if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + local TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + export TEST_PHP_CGI_EXECUTABLE + fi + + if [[ -x "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm" ]] ; then + local TEST_PHP_FPM_EXECUTABLE="${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm" + export TEST_PHP_FPM_EXECUTABLE fi if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + local TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + export TEST_PHPDBG_EXECUTABLE fi # The IO capture tests need to be disabled because they fail when diff --git a/dev-lang/zig/files/zig-9999-fix-install-prefix.patch b/dev-lang/zig/files/zig-9999-fix-install-prefix.patch deleted file mode 100644 index 2ef938486172..000000000000 --- a/dev-lang/zig/files/zig-9999-fix-install-prefix.patch +++ /dev/null @@ -1,82 +0,0 @@ -# https://codeberg.org/ziglang/zig/pulls/35809 - -From: Eric Joldasov <bratishkaerik@landless-city.net> -Subject: [PATCH] Resolve relative install directories against install prefix - -This fixes a regression introduced on the `master` branch in commit -0505318efe0d2757a344dded9ae1607f948f7511 -(PR https://codeberg.org/ziglang/zig/pulls/35428). - -In Zig 0.16 and earlier, overriding install sub-directories (such as -`--prefix-lib-dir`) with a relative path correctly resolved them -against the "install prefix". The mentioned PR changed this behavior -(though this was not mentioned in its description), causing relative -path overrides to resolve against the "current working directory" -instead. - -This commit restores the old behavior and brings the logic back in line -with existing build system conventions (CMake, Autotools, Meson): - -1. Absolute paths are used as-is. -2. Relative paths are resolved relative to the install - prefix path, rather than CWD. - -Ecosystem context: -https://github.com/mesonbuild/meson/pull/9903 - -Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net> ---- - lib/compiler/Maker.zig | 38 ++++++++++++++++++++++++++------------ - 1 file changed, 26 insertions(+), 12 deletions(-) - -diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig -index ad73ac16272d..20884225b3d7 100644 ---- a/lib/compiler/Maker.zig -+++ b/lib/compiler/Maker.zig -@@ -631,20 +631,34 @@ pub fn main(init: process.Init.Minimal) !void { - .sub_path = "zig-out", - }; - -- const install_lib_path: Path = if (override_lib_dir) |cwd_relative| .{ -- .root_dir = .cwd(), -- .sub_path = cwd_relative, -- } else try install_prefix_path.join(arena, "lib"); -+ // Standard installation convention (matching CMake, Autotools, and Meson): -+ // 1. Absolute paths => used as-is. -+ // 2. Relative paths => used as relative to the install prefix (NOT CWD). -+ // -+ // REF: https://github.com/mesonbuild/meson/pull/9903 -+ const install_lib_path: Path = if (override_lib_dir) |lib_dir| -+ if (Dir.path.isAbsolute(lib_dir)) .{ -+ .root_dir = .cwd(), -+ .sub_path = lib_dir, -+ } else try install_prefix_path.join(arena, lib_dir) -+ else -+ try install_prefix_path.join(arena, "lib"); - -- const install_bin_path: Path = if (override_bin_dir) |cwd_relative| .{ -- .root_dir = .cwd(), -- .sub_path = cwd_relative, -- } else try install_prefix_path.join(arena, "bin"); -+ const install_bin_path: Path = if (override_bin_dir) |bin_dir| -+ if (Dir.path.isAbsolute(bin_dir)) .{ -+ .root_dir = .cwd(), -+ .sub_path = bin_dir, -+ } else try install_prefix_path.join(arena, bin_dir) -+ else -+ try install_prefix_path.join(arena, "bin"); - -- const install_include_path: Path = if (override_include_dir) |cwd_relative| .{ -- .root_dir = .cwd(), -- .sub_path = cwd_relative, -- } else try install_prefix_path.join(arena, "include"); -+ const install_include_path: Path = if (override_include_dir) |include_dir| -+ if (Dir.path.isAbsolute(include_dir)) .{ -+ .root_dir = .cwd(), -+ .sub_path = include_dir, -+ } else try install_prefix_path.join(arena, include_dir) -+ else -+ try install_prefix_path.join(arena, "include"); - - const now = Io.Clock.Timestamp.now(io, .awake); - diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index 39a628ce39b6..c8a0ae527f60 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -72,10 +72,6 @@ IDEPEND="app-eselect/eselect-zig" DOCS=( "README.md" "doc/build.zig.zon.md" ) -PATCHES=( - "${FILESDIR}/zig-9999-fix-install-prefix.patch" -) - # zig.eclass does not set this for us since we use ZIG_OPTIONAL=1 QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" |
