elixir: update to 1.15.1.

This commit is contained in:
Duncaen 2023-07-01 17:53:42 +02:00
parent 478d6c9c93
commit b6afc05c9b
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
3 changed files with 2 additions and 71 deletions

View File

@ -1,29 +0,0 @@
From 73b65eca5af294a8afbed5bc73c178da18f0055c Mon Sep 17 00:00:00 2001
From: cjschneider2 <cjschneider2@users.noreply.github.com>
Date: Fri, 23 Jun 2023 16:04:29 +0200
Subject: [PATCH] Use printf instead of echo to output user flags (#12704)
Fixes #12677.
Using printf here prevents an error when outputting the filtered flag
`-e` as doing with with `echo "-e"` doesn't output anything
(deleting the option we wanted to filter).
More info: https://unix.stackexchange.com/a/65819
---
bin/elixir | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/elixir b/bin/elixir
index 3c0323f0f1..cb0a84650b 100755
--- a/bin/elixir
+++ b/bin/elixir
@@ -233,7 +233,7 @@ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SC
if [ -n "$RUN_ERL_PIPE" ]; then
ESCAPED=""
for PART in "$@"; do
- ESCAPED="$ESCAPED $(echo "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
+ ESCAPED="$ESCAPED $(printf '%s' "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
done
mkdir -p "$RUN_ERL_PIPE"
mkdir -p "$RUN_ERL_LOG"

View File

@ -1,38 +0,0 @@
From 9b254e6830d0f44e26179582a16fef6f642df754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
Date: Tue, 20 Jun 2023 12:31:53 +0200
Subject: [PATCH] Do not expect OTP to be compiled with docs, closes #12677
---
lib/mix/test/mix/tasks/compile_test.exs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
index cdc40977c7..c4e672ffd2 100644
--- a/lib/mix/test/mix/tasks/compile_test.exs
+++ b/lib/mix/test/mix/tasks/compile_test.exs
@@ -329,16 +329,22 @@ defmodule Mix.Tasks.CompileTest do
Application.delete_env(:sample, :hello, persistent: true)
end
- test "code path prunning" do
+ test "code path pruning" do
Mix.ensure_application!(:parsetools)
+ otp_docs? = match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:zlib))
in_fixture("no_mixfile", fn ->
assert Mix.Task.run("compile", []) == {:ok, []}
assert :code.where_is_file(~c"parsetools.app") == :non_existing
# Make sure erts is also kept but not loaded
- assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
assert Application.spec(:erts, :vsn) == nil
+
+ if otp_docs? do
+ assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
+ else
+ IO.warn("Erlang/OTP was not compiled with docs, skipping assertion")
+ end
end)
end

View File

@ -1,6 +1,6 @@
# Template file for 'elixir'
pkgname=elixir
version=1.15.0
version=1.15.1
revision=1
build_style=gnu-makefile
make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
@ -17,7 +17,7 @@ license="Apache-2.0"
homepage="http://elixir-lang.org/"
changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
checksum=0f4df7574a5f300b5c66f54906222cd46dac0df7233ded165bc8e80fd9ffeb7a
checksum=cf89434f4cf7477b929c56e16ae22bf08e64101a144911d2834a2f3c9b3ae40f
post_patch() {
# XXX: find a better solution
@ -26,8 +26,6 @@ post_patch() {
# left: "/usr/lib/erlang"
# right: "/usr/lib64/erlang"
vsed -e '/assert root_dir == :code\.root_dir()/d' -i lib/mix/test/mix/tasks/release_test.exs
# orig file caused by line offset of the issue 12704 diff
rm bin/elixir.orig
}
do_check() {