diff options
| author | wm4 <wm4@nowhere> | 2015-03-30 19:46:02 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-30 19:49:24 +0200 |
| commit | 39f6f6b104ea51848ab99dd08e33745a9ad976eb (patch) | |
| tree | cb16ad0a478d0808f0695c2f20cc9ac58840ac88 | |
| parent | ebef5da074b7bfd1cf3a9f6e110d71e87eaa1901 (diff) | |
| download | mpv-39f6f6b104ea51848ab99dd08e33745a9ad976eb.tar.bz2 mpv-39f6f6b104ea51848ab99dd08e33745a9ad976eb.tar.xz | |
build: make posix_spawn() mandatory
It was already accidentally used unconditionally by command.c.
Apparently this worked well for us, so don't change anything about,
but should it be unavailable, fail at configure time instead of compile
time.
| -rw-r--r-- | player/lua.c | 4 | ||||
| -rw-r--r-- | wscript | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/player/lua.c b/player/lua.c index 651162342f..7e44ec4c58 100644 --- a/player/lua.c +++ b/player/lua.c @@ -1146,7 +1146,6 @@ static int script_join_path(lua_State *L) return 1; } -#if HAVE_POSIX_SPAWN || defined(__MINGW32__) struct subprocess_cb_ctx { struct mp_log *log; void* talloc_ctx; @@ -1223,7 +1222,6 @@ static int script_subprocess(lua_State *L) lua_setfield(L, -2, "stdout"); // res return 1; } -#endif static int script_parse_json(lua_State *L) { @@ -1295,9 +1293,7 @@ static const struct fn_entry utils_fns[] = { FN_ENTRY(readdir), FN_ENTRY(split_path), FN_ENTRY(join_path), -#if HAVE_POSIX_SPAWN || defined(__MINGW32__) FN_ENTRY(subprocess), -#endif FN_ENTRY(parse_json), {0} }; @@ -213,7 +213,13 @@ iconv support use --disable-iconv.", 'name': 'posix-spawn', 'desc': 'POSIX spawnp()/kill()', 'func': check_statement(['spawn.h', 'signal.h'], - 'posix_spawnp(0,0,0,0,0,0); kill(0,0)') + 'posix_spawnp(0,0,0,0,0,0); kill(0,0)'), + 'deps_neg': ['mingw'], + }, { + 'name': 'subprocess', + 'desc': 'posix_spawnp() or MinGW', + 'func': check_true, + 'deps_any': ['posix-spawn', 'mingw'], }, { 'name': 'glob', 'desc': 'glob()', |