From 0d6647e4f0da95c4e9e77e1ddbadaf2552c3d7a1 Mon Sep 17 00:00:00 2001 From: pancake Date: Wed, 1 Aug 2018 03:12:33 +0200 Subject: [PATCH] Add sys/meson.py --nosudo (use sudo by default) --- shlr/sdb/src/json/js0n.c | 1 - sys/meson.py | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/shlr/sdb/src/json/js0n.c b/shlr/sdb/src/json/js0n.c index a1ebd79fab..37114aed9c 100644 --- a/shlr/sdb/src/json/js0n.c +++ b/shlr/sdb/src/json/js0n.c @@ -17,7 +17,6 @@ int sdb_js0n(const ut8 *js, RangstrType len, RangstrType *out) { #pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic ignored "-Winitializer-overrides" -#pragma GCC diagnostic ignored "-Woverride-init" #define HAVE_RAWSTR 0 #define PUSH(i) if(depth == 1) prev = *out++ = ((cur+i) - js) diff --git a/sys/meson.py b/sys/meson.py index 42de2f9961..7726f77fdb 100755 --- a/sys/meson.py +++ b/sys/meson.py @@ -253,6 +253,8 @@ def main(): help='Adds support for Windows XP') parser.add_argument('--pull', action='store_true', help='git pull before building') + parser.add_argument('--nosudo', action='store_true', + help='Do not use sudo for install/symstall/uninstall') parser.add_argument('--uninstall', action='store_true', help='Uninstall') parser.add_argument('--symstall', action='store_true', @@ -307,15 +309,18 @@ def main(): PATH_FMT.update(R2_PATH) + sudo = 'sudo ' + if args.nosudo: + sudo = '' # Build it! log.debug('Arguments: %s', args) build(args) if args.uninstall: - os.system('make uninstall PWD="$PWD/build" BTOP="$PWD/build/binr"') + os.system(sudo + 'make uninstall PWD="$PWD/build" BTOP="$PWD/build/binr"') if args.install: install(args) if args.symstall: - os.system('make symstall PWD="$PWD/build" BTOP="$PWD/build/binr"') + os.system(sudo + 'make symstall PWD="$PWD/build" BTOP="$PWD/build/binr"') if __name__ == '__main__': main()