diff options
| author | Loïc Hoguin <[email protected]> | 2025-08-29 16:45:13 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2025-08-29 17:20:56 +0200 |
| commit | 7cef74a75f1d1be150a2a3669caf58f7607e3052 (patch) | |
| tree | 91f2668c1c84bbb8fd8d245fed411946f2ac9eab | |
| parent | 973ccc3ac9b5c1223a42e267e89c9043ae9a06ae (diff) | |
| download | erlang.mk-7cef74a75f1d1be150a2a3669caf58f7607e3052.tar.gz erlang.mk-7cef74a75f1d1be150a2a3669caf58f7607e3052.tar.bz2 erlang.mk-7cef74a75f1d1be150a2a3669caf58f7607e3052.zip | |
Thanks Ilya Khaprov for the fix.
| -rw-r--r-- | .github/workflows/ci.yaml | 1 | ||||
| -rw-r--r-- | core/deps.mk | 21 | ||||
| -rw-r--r-- | test/hexpm_packages.txt | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e51ef0b..9b5740b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -301,6 +301,7 @@ jobs: - '^cowboy \|^cowlib \|^gun \|^ranch ' - '^amqp_client \|^amqp10_client \|^aten \|^credentials_obfuscation \|^cuttlefish ' - '^gen_batch_server \|^ra \|^seshat \|^stdout_formatter \|^sysmon_handler ' + - '^rocksdb ' extra: ['', 'LEGACY=1'] runs-on: ${{ matrix.os }} steps: diff --git a/core/deps.mk b/core/deps.mk index da7f7c4..3f76edf 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -531,10 +531,11 @@ define dep_autopatch_rebar.erl Write(io_lib:format("COMPILE_FIRST +=~s\n", [Names])) end end(), - Write("\n\nrebar_dep: preprocess pre-deps deps pre-app app\n"), + Write("\n\nrebar_dep: preprocess pre-deps deps pre-app app post-app\n"), Write("\npreprocess::\n"), Write("\npre-deps::\n"), Write("\npre-app::\n"), + Write("\npost-app::\n"), PatchHook = fun(Cmd) -> Cmd2 = re:replace(Cmd, "^([g]?make)(.*)( -C.*)", "\\\\1\\\\3\\\\2", [{return, list}]), case Cmd2 of @@ -565,6 +566,24 @@ define dep_autopatch_rebar.erl end || H <- Hooks] end end(), + fun() -> + case lists:keyfind(post_hooks, 1, Conf) of + false -> ok; + {_, Hooks} -> + [case H of + {compile, Cmd} -> + Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n"); + {{pc, compile}, Cmd} -> + Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n"); + {Regex, compile, Cmd} -> + case rebar_utils:is_arch(Regex) of + true -> Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n"); + false -> ok + end; + _ -> ok + end || H <- Hooks] + end + end(), ShellToMk = fun(V0) -> V1 = re:replace(V0, "[$$][(]", "$$\(shell ", [global]), V = re:replace(V1, "([$$])(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]), diff --git a/test/hexpm_packages.txt b/test/hexpm_packages.txt index 0a55766..e0fda41 100644 --- a/test/hexpm_packages.txt +++ b/test/hexpm_packages.txt @@ -1641,7 +1641,7 @@ rlamb_publishtest 0.1.0 rlp 1.1.0 rmpc 18.5.9 robots 1.1.2 -rocksdb 1.8.0 +rocksdb 1.9.0 rocksdb_cloud 1.0.1 roni 1.0.1 roster 3.4.0 |