From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/2 v4] add scons conf tool
Date: Thu, 31 Oct 2019 20:36:17 +0100 [thread overview]
Message-ID: <20191031193617.GB30804@lenoch> (raw)
In-Reply-To: <20191031193522.GA30804@lenoch>
SCons is a tool of constant reconfiguration. Almost each call
means performing the configure tests, therefore it does not
nicely fit into PTXDist stages. To get saner behaviour and save
some time everything is done at install stage.
Also note that SCons does not enforce any standard targets nor
variable names, athough most projects seems to support DESTDIR
environment variable and install target.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v{2,3}: None
-v4: Moved all the work to install stage
scripts/lib/ptxd_make_world_common.sh | 7 ++++++-
scripts/lib/ptxd_make_world_compile.sh | 2 ++
scripts/lib/ptxd_make_world_install.sh | 11 +++++++++++
scripts/lib/ptxd_make_world_prepare.sh | 7 ++++++-
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
index dc601cc05..c277304c7 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -319,6 +319,11 @@ ptxd_make_world_init() {
pkg_make_env="${pkg_conf_env:-${!env_ptr}}"
pkg_make_opt="${pkg_make_opt:-build}"
;;
+ scons)
+ local env_ptr="ptx_conf_env_${pkg_type}"
+ pkg_make_env="${pkg_conf_env:-${!env_ptr}}"
+ pkg_make_opt="${pkg_conf_opt}"
+ ;;
meson)
local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}${conf_opt_ext}"
local conf_env_ptr="ptx_conf_env_${pkg_conf_tool}_${pkg_type}"
@@ -428,7 +433,7 @@ ptxd_make_world_init() {
python*)
pkg_install_opt="${pkg_install_opt} --root=${pkg_pkg_dir}"
;;
- ninja)
+ ninja|scons)
pkg_env="DESTDIR=\"${pkg_pkg_dir}\" ${pkg_env}"
;;
*)
diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh
index c7093250d..0c86878a2 100644
--- a/scripts/lib/ptxd_make_world_compile.sh
+++ b/scripts/lib/ptxd_make_world_compile.sh
@@ -37,6 +37,8 @@ ptxd_make_world_compile() {
"${pkg_make_opt}" \
"${pkg_make_par}"
;;
+ scons)
+ ;;
*)
ptxd_eval \
"${pkg_path}" \
diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh
index ba8e2058e..a7ae6cd95 100644
--- a/scripts/lib/ptxd_make_world_install.sh
+++ b/scripts/lib/ptxd_make_world_install.sh
@@ -98,6 +98,17 @@ ptxd_make_world_install() {
-j1 \
)
;;
+ scons)
+ cmd=( \
+ "${pkg_path}" \
+ "${pkg_env}" \
+ "${pkg_make_env}" \
+ scons \
+ -C "${pkg_build_dir}" \
+ "${pkg_make_opt}" \
+ "${pkg_install_opt}" \
+ )
+ ;;
*)
cmd=( \
"${pkg_path}" \
diff --git a/scripts/lib/ptxd_make_world_prepare.sh b/scripts/lib/ptxd_make_world_prepare.sh
index e21a85b0e..38e7f1051 100644
--- a/scripts/lib/ptxd_make_world_prepare.sh
+++ b/scripts/lib/ptxd_make_world_prepare.sh
@@ -204,13 +204,18 @@ ptxd_make_world_prepare() {
ptxd_bailout "'${pkg_label}' uses '${pkg_conf_tool}' but does not select any python"
fi
;;
+ scons)
+ if ! [[ "${pkg_build_deps}" =~ "host-python-${pkg_conf_tool}" ]]; then
+ ptxd_bailout "'${pkg_label}' uses '${pkg_conf_tool}' but does not select 'host-python-${pkg_conf_tool}'"
+ fi
+ ;;
esac
case "${pkg_conf_tool}" in
autoconf|cmake|qmake|kconfig|perl|meson)
cd -- "${pkg_build_dir}" &&
ptxd_make_world_prepare_"${pkg_conf_tool}" ;;
- python|python3)
+ python|python3|scons)
: ;; # nothing to do
"NO") echo "prepare stage disabled." ;;
"") echo "No prepare tool found. Do nothing." ;;
--
2.24.0.rc1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2019-10-31 19:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 19:35 [ptxdist] [PATCH 0/2 v4] add scons conf tool and let gpsd to use it Ladislav Michl
2019-10-31 19:36 ` Ladislav Michl [this message]
2019-10-31 19:37 ` [ptxdist] [PATCH 2/2 v4] gpsd: version bump 2.39 -> 3.19 Ladislav Michl
2019-10-31 20:17 ` [ptxdist] [PATCH 0/2 v4] add scons conf tool and let gpsd to use it Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191031193617.GB30804@lenoch \
--to=ladis@linux-mips.org \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox