summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2017-10-29 13:03:52 +0100
committerTreeve Jelbert2017-10-31 09:31:44 +0100
commitc5065620965c8f7f00e3025af43bed3f48d6e13d (patch)
tree50681f0475a0580f6a3a9858d4eb586b9ffec436
parent9ec6bf2624da352f73994629d6134fa8b2da6343 (diff)
tweaks for meson builds
-rw-r--r--ChangeLog5
-rwxr-xr-xMESON_CONFIGURE3
-rwxr-xr-xMESON_FUNCTIONS6
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f0af92d82..fefa0c633a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-29 Treeve Jelbert <treeve@sourcemage.org>
+ * MESON_CONFIGURE: added
+ * MESON_FUNCTIONS: adjust
+ allow to specify buildtype
+
2017-10-19 Treeve Jelbert <treeve@sourcemage.org>
* xorg-driver/xf86-video-modesetting: spell deprecated [replaced by now in xorg-server]
diff --git a/MESON_CONFIGURE b/MESON_CONFIGURE
new file mode 100755
index 0000000000..ccb9dcd1db
--- /dev/null
+++ b/MESON_CONFIGURE
@@ -0,0 +1,3 @@
+config_query_list MESON_BUILD_TYPE 'which build type?' plain debug debugoptimized release minsize
+#config_query_option MESON_TESTS 'build tests?' n "-DBUILD_TESTING=1" "-DBUILD_TESTING=0"
+
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index a32293d7a0..ea2ac89632 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -1,8 +1,10 @@
# special functions for projects shich use meson build system
meson_build () {
- export LANG=$LC_ALL
+ MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}"
+# export LANG=$LC_ALL
cd $SOURCE_DIRECTORY
- SCRIPT="meson --prefix ${INSTALL_ROOT}/usr --buildtype release --default-library shared --libdir lib"
+ SCRIPT="meson --prefix ${INSTALL_ROOT}/usr --buildtype ${MESON_BUILD_TYPE} \
+ --default-library shared --libdir lib"
for LL in $OPTS; do
SCRIPT+=" -D$LL"
done