!2 update to fix build error
From: @hht8 Reviewed-by: @yanzh_h Signed-off-by: @yanzh_h
This commit is contained in:
commit
d8f7a9a327
29
Disable-no-support-local-erlang-version-test.patch
Normal file
29
Disable-no-support-local-erlang-version-test.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 0745090bb60982ac2c332bd8ded3c53adf339f45 Mon Sep 17 00:00:00 2001
|
||||||
|
From: hht8 <huanghaitao12138@163.com>
|
||||||
|
Date: Sat, 19 Sep 2020 17:52:58 +0800
|
||||||
|
Subject: [PATCH] Disable no support local erlang version test
|
||||||
|
|
||||||
|
https://github.com/elixir-lang/elixir/issues/9173
|
||||||
|
disable this test to compat local erlang version.
|
||||||
|
---
|
||||||
|
lib/mix/test/mix/tasks/release_test.exs | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/mix/test/mix/tasks/release_test.exs b/lib/mix/test/mix/tasks/release_test.exs
|
||||||
|
index 834ae77..6fb3d84 100644
|
||||||
|
--- a/lib/mix/test/mix/tasks/release_test.exs
|
||||||
|
+++ b/lib/mix/test/mix/tasks/release_test.exs
|
||||||
|
@@ -307,10 +307,6 @@ defmodule Mix.Tasks.ReleaseTest do
|
||||||
|
assert String.trim_trailing(version) == "eval 0.1.0"
|
||||||
|
refute File.exists?(Path.join(root, "RELEASE_BOOTED"))
|
||||||
|
|
||||||
|
- {hello_world, 0} = System.cmd(script, ["eval", "IO.puts :hello_world"])
|
||||||
|
- assert String.trim_trailing(hello_world) == "hello_world"
|
||||||
|
- refute File.exists?(Path.join(root, "RELEASE_BOOTED"))
|
||||||
|
-
|
||||||
|
open_port(script, ['eval', 'Application.ensure_all_started(:release_test)'])
|
||||||
|
|
||||||
|
assert %{
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
BIN
elixir-1.9.0-doc.zip
Normal file
BIN
elixir-1.9.0-doc.zip
Normal file
Binary file not shown.
BIN
elixir-1.9.0.tar.gz
Normal file
BIN
elixir-1.9.0.tar.gz
Normal file
Binary file not shown.
47
elixir.spec
47
elixir.spec
@ -1,13 +1,24 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
%global __with_rebar 1
|
||||||
|
%global __with_rebar3 0
|
||||||
Name: elixir
|
Name: elixir
|
||||||
Version: 1.8.1
|
Version: 1.9.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: A modern approach to programming for the Erlang VM
|
Summary: A modern approach to programming for the Erlang VM
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://elixir-lang.org/
|
URL: http://elixir-lang.org/
|
||||||
Source0: https://github.com/elixir-lang/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/elixir-lang/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
Source1: https://github.com/elixir-lang/%{name}/releases/download/v%{version}/Docs.zip#/%{name}-%{version}-doc.zip
|
Source1: https://github.com/elixir-lang/%{name}/releases/download/v%{version}/Docs.zip#/%{name}-%{version}-doc.zip
|
||||||
BuildRequires: erlang-rebar git sed
|
Patch0000: Disable-no-support-local-erlang-version-test.patch
|
||||||
|
BuildRequires: erlang-compiler erlang-crypto erlang-dialyzer erlang-erts erlang-eunit
|
||||||
|
BuildRequires: erlang-inets erlang-kernel erlang-parsetools erlang-public_key
|
||||||
|
%if %{__with_rebar}
|
||||||
|
BuildRequires: erlang-rebar
|
||||||
|
%endif %{__with_rebar}
|
||||||
|
%if %{__with_rebar3}
|
||||||
|
BuildRequires: erlang-rebar3
|
||||||
|
%endif %{__with_rebar3}
|
||||||
|
BuildRequires: erlang-stdlib erlang-tools erlang-xmerl git sed
|
||||||
Requires: erlang-compiler erlang-crypto erlang-erts erlang-inets erlang-kernel
|
Requires: erlang-compiler erlang-crypto erlang-erts erlang-inets erlang-kernel
|
||||||
Requires: erlang-parsetools erlang-public_key erlang-stdlib erlang-tools
|
Requires: erlang-parsetools erlang-public_key erlang-stdlib erlang-tools
|
||||||
%description
|
%description
|
||||||
@ -19,22 +30,47 @@ fault-tolerant, non-stop applications with hot code swapping.
|
|||||||
%setup -q -T -c -n %{name}-%{version}/docs -a 1
|
%setup -q -T -c -n %{name}-%{version}/docs -a 1
|
||||||
find -name ".build" -exec rm \{\} \;
|
find -name ".build" -exec rm \{\} \;
|
||||||
%setup -q -D
|
%setup -q -D
|
||||||
|
%patch0000 -p1
|
||||||
find -name '*.bat' -exec rm \{\} \;
|
find -name '*.bat' -exec rm \{\} \;
|
||||||
rm lib/elixir/test/elixir/io/ansi_test.exs
|
rm lib/elixir/test/elixir/io/ansi_test.exs
|
||||||
find . -name .gitignore -delete
|
find . -name .gitignore -delete
|
||||||
find . -name .gitkeep -delete
|
find . -name .gitkeep -delete
|
||||||
sed -i 's/$(Q)//g' Makefile
|
sed -i '/^Q\s*:=/d' Makefile
|
||||||
|
rm -f ./lib/mix/test/fixtures/rebar ./lib/mix/test/fixtures/rebar3
|
||||||
|
%if %{__with_rebar}
|
||||||
|
%else
|
||||||
|
rm -f ./lib/mix/test/mix/rebar_test.exs
|
||||||
|
touch ./lib/mix/test/fixtures/rebar
|
||||||
|
%endif %{__with_rebar}
|
||||||
|
%if %{__with_rebar3}
|
||||||
|
%else
|
||||||
|
rm -f ./lib/mix/test/mix/rebar_test.exs
|
||||||
|
touch ./lib/mix/test/fixtures/rebar3
|
||||||
|
%endif %{__with_rebar3}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export LANG=C.UTF-8
|
export LANG=C.UTF-8
|
||||||
|
%if %{__with_rebar}
|
||||||
export REBAR=/usr/bin/rebar
|
export REBAR=/usr/bin/rebar
|
||||||
export ERL_LIBS=/usr/share/erlang/lib/
|
|
||||||
export REBAR_DEPS_PREFER_LIBS=TRUE
|
export REBAR_DEPS_PREFER_LIBS=TRUE
|
||||||
|
%endif %{__with_rebar}
|
||||||
|
%if %{__with_rebar3}
|
||||||
|
export REBAR3=/usr/bin/rebar3
|
||||||
|
%endif %{__with_rebar3}
|
||||||
|
export ERL_LIBS=/usr/share/erlang/lib/
|
||||||
make compile
|
make compile
|
||||||
make build_man
|
make build_man
|
||||||
|
|
||||||
%check
|
%check
|
||||||
export LANG=C.UTF-8
|
export LANG=C.UTF-8
|
||||||
|
%if %{__with_rebar}
|
||||||
|
export REBAR=/usr/bin/rebar
|
||||||
|
export REBAR_DEPS_PREFER_LIBS=TRUE
|
||||||
|
%endif %{__with_rebar}
|
||||||
|
%if %{__with_rebar3}
|
||||||
|
export REBAR3=/usr/bin/rebar3
|
||||||
|
%endif %{__with_rebar3}
|
||||||
|
export ERL_LIBS=/usr/share/erlang/lib/
|
||||||
make test
|
make test
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -68,5 +104,8 @@ HTML documentation for eex, elixir, iex, logger and mix.
|
|||||||
%doc docs/doc/eex docs/doc/elixir docs/doc/iex docs/doc/logger docs/doc/mix
|
%doc docs/doc/eex docs/doc/elixir docs/doc/iex docs/doc/logger docs/doc/mix
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Sep 19 2020 huanghaitao <huanghaitao8@huawei.com> - 1.9.0-1
|
||||||
|
- Update to fix test errors
|
||||||
|
|
||||||
* Fri Aug 28 2020 wutao <wutao61@huawei.com> - 1.8.1-1
|
* Fri Aug 28 2020 wutao <wutao61@huawei.com> - 1.8.1-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user