diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 10:52:35 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-13 14:45:56 +0200 |
| commit | c7006e45f3a3bcf75950037c8b309489af19d6aa (patch) | |
| tree | b353abc06f7d5b12a8e2436a29928a857d28df96 /scripts/lib/ptxd_make_world_common.sh | |
| parent | 1c658ac035b38a96332d1d3a379ffacfa355cf7f (diff) | |
| download | ptxdist-c7006e45f3a3bcf75950037c8b309489af19d6aa.tar.gz ptxdist-c7006e45f3a3bcf75950037c8b309489af19d6aa.tar.xz | |
add meson conf tool
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index c99500b8e..befd1df1e 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -130,13 +130,6 @@ ptxd_make_world_init_compat() { fi fi - # DESTDIR - if [[ "${pkg_conf_tool}" =~ "python" ]]; then - pkg_install_opt="${pkg_install_opt} --root=${pkg_pkg_dir}" - else - pkg_install_opt="DESTDIR=\"${pkg_pkg_dir}\" INSTALL_ROOT=\"${pkg_pkg_dir}\" ${pkg_install_opt}" - fi - # # pkg_binconfig_glob # @@ -295,6 +288,9 @@ ptxd_make_world_init() { if [ -e "${pkg_conf_dir}/Makefile.PL" ]; then pkg_conf_tool=${pkg_conf_tool}perl fi + if [ -e "${pkg_conf_dir}/meson.build" ]; then + pkg_conf_tool=${pkg_conf_tool}meson + fi fi case "${pkg_conf_tool}" in @@ -315,9 +311,35 @@ ptxd_make_world_init() { pkg_make_env="${pkg_conf_env:-${!env_ptr}}" pkg_make_opt="${pkg_make_opt:-build}" ;; + meson) + local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}${conf_opt_ext}" + + pkg_conf_opt="${pkg_conf_opt:-${!conf_opt_ptr}}" + pkg_conf_env="PTXDIST_ICECC= ${pkg_conf_env}" + pkg_env="${pkg_env} LC_ALL='C.UTF-8'" + if [ "${PTXDIST_VERBOSE}" = "1" ]; then + pkg_make_opt="-v ${pkg_make_opt}" + pkg_install_opt="-v ${pkg_install_opt}" + fi + # both jobserver and argument limit parallelism so both are needed + pkg_env="${pkg_env} MAKEFLAGS='${PTXDIST_JOBSERVER_FLAGS}'" + PTXDIST_PARALLELMFLAGS_INTERN="${PTXDIST_PARALLEL_FLAGS}" + + unset conf_opt_ptr + ;; *) ;; esac + # DESTDIR + if [[ "${pkg_conf_tool}" =~ "python" ]]; then + pkg_install_opt="${pkg_install_opt} --root=${pkg_pkg_dir}" + elif [ "${pkg_conf_tool}" = "meson" ]; then + pkg_env="${pkg_env} DESTDIR=\"${pkg_pkg_dir}\"" + else + pkg_install_opt="DESTDIR=\"${pkg_pkg_dir}\" INSTALL_ROOT=\"${pkg_pkg_dir}\" ${pkg_install_opt}" + fi + + # # build dir # @@ -325,6 +347,7 @@ ptxd_make_world_init() { if [ -z "${pkg_build_oot}" ]; then case "${pkg_conf_tool}" in cmake) pkg_build_oot=YES ;; + meson) pkg_build_oot=YES ;; *) pkg_build_oot=NO ;; esac fi |