From 9ec59e5d4b1f333bba43b1ce37ce064cb036756f Mon Sep 17 00:00:00 2001 From: wang--ge Date: Fri, 21 Jan 2022 12:28:33 +0800 Subject: [PATCH] remove -lerl_interface flag form default LDFLAG --- 0014-remove-lerl_interface-build-flag.patch | 34 +++++++++++++++++++++ erlang-rebar.spec | 7 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0014-remove-lerl_interface-build-flag.patch diff --git a/0014-remove-lerl_interface-build-flag.patch b/0014-remove-lerl_interface-build-flag.patch new file mode 100644 index 0000000..1098e84 --- /dev/null +++ b/0014-remove-lerl_interface-build-flag.patch @@ -0,0 +1,34 @@ +From ee8f239d6b54d4a583070505b1374cdc3c05f9c7 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Fri, 21 Jan 2022 12:08:54 +0800 +Subject: [PATCH] remove -lerl_interface build flag + +--- + src/rebar_port_compiler.erl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl +index 0ba9e84..f1d7602 100644 +--- a/src/rebar_port_compiler.erl ++++ b/src/rebar_port_compiler.erl +@@ -137,7 +137,7 @@ info_help(Description) -> + " CXXFLAGS - C++ compiler~n" + " LDFLAGS - Link flags~n" + " ERL_CFLAGS - default -I paths for erts and ei~n" +- " ERL_LDFLAGS - default -L and -lerl_interface -lei~n" ++ " ERL_LDFLAGS - default -L and -lei~n" + " DRV_CFLAGS - flags that will be used for compiling~n" + " DRV_LDFLAGS - flags that will be used for linking~n" + " EXE_CFLAGS - flags that will be used for compiling~n" +@@ -679,7 +679,7 @@ default_env() -> + "\" " + ])}, + {"ERL_EI_LIBDIR", lists:concat(["\"", erl_interface_dir(lib), "\""])}, +- {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lerl_interface -lei"}, ++ {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lei"}, + {"ERLANG_ARCH" , rebar_utils:wordsize()}, + {"ERLANG_TARGET", rebar_utils:get_arch()}, + +-- +2.30.0 + diff --git a/erlang-rebar.spec b/erlang-rebar.spec index 5dd2661..cff7647 100644 --- a/erlang-rebar.spec +++ b/erlang-rebar.spec @@ -4,7 +4,7 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Name: erlang-%{realname} Version: 2.6.4 -Release: 1 +Release: 2 BuildArch: noarch Summary: Erlang Build Tools License: MIT @@ -23,6 +23,7 @@ Patch10: rebar-0010-Try-shell-variable-VSN-first.patch Patch11: rebar-0011-Allow-ignoring-missing-deps.patch Patch12: rebar-0012-Drop-obsolete-crypto-rand_uniform-2.patch Patch13: rebar-0013-Remove-compat-random-modules.patch +Patch14: 0014-remove-lerl_interface-build-flag.patch %if 0%{?need_bootstrap} < 1 BuildRequires: erlang-rebar erlang-getopt %else @@ -64,6 +65,7 @@ EOT %patch11 -p1 -b .skip_deps_checking %patch12 -p1 -b .erl20 %patch13 -p1 -b .erl22_compat +%patch14 -p1 %build %if 0%{?need_bootstrap} < 1 @@ -92,5 +94,8 @@ sed -i -e "s,-noshell -noinput,-noshell -noinput -pa .,g" ./rebar %{erlang_appdir}/ %changelog +* Fri Jan 21 2022 Ge Wang - 2.6.4-2 +- Remove -lerl_interface flag from default LDFLAG due to erlang updated to 23.3.4.9 version + * Fri Sep 4 2020 Ge Wang - 2.6.4-1 - Package init