osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email )
Change subject: gen_makefile: erlang: fix missing clone and deps
......................................................................
gen_makefile: erlang: fix missing clone and deps
Add a dummy configure target for erlang that ensures the git clone and
building of dependencies is done before attempting to build erlang
projects. A dummy target is used to make the logic consistent with
autotools and meson.
This is in preparation for building python libraries for pyhss, which
will work similarly.
Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27
---
M gen_makefile.py
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/gen_makefile.py b/gen_makefile.py
index 3885e10..e5f07ab 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -382,7 +382,10 @@
touch $@
'''
elif buildsystem == "erlang":
- return ""
+ return f'''
+.make.{proj}.configure: .make.{proj}.clone {deps_installed}
+ touch $@
+ '''
else:
assert False, f"unknown buildsystem: {buildsystem}"
@@ -414,7 +417,7 @@
'''
elif buildsystem == "erlang":
return f'''
-.make.{proj}.build: $({proj}_files)
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
@echo "\\n\\n\\n===== $@\\n"
set -x && \\
export REBAR_BASE_DIR="$$PWD/{build_proj}" && \\
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27
Gerrit-Change-Number: 41212
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: jolly <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
