kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

[mod_avmd, esl/python] Two build fixups (#611)

Browse Source
This commit is contained in:
Christian Glombek 2021-03-24 17:30:52 +01:00 committed by GitHub
parent 4e581b096b
commit 513b0fbf00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/esl/python/python-config
View File

@ -1,5 +1,6 @@
#! /usr/bin/python2.5 #!/usr/bin/env python
from __future__ import print_function
import sys import sys
import os import os
import getopt import getopt
@ -9,8 +10,7 @@ valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
'ldflags', 'help'] 'ldflags', 'help']
def exit_with_usage(code=1): def exit_with_usage(code=1):
print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], print("Usage: %s [%s]" % (sys.argv[0], '|'.join('--'+opt for opt in valid_opts)), file=sys.stderr)
'|'.join('--'+opt for opt in valid_opts))
sys.exit(code) sys.exit(code)
try: try:
@ -30,17 +30,17 @@ if opt == '--help':
exit_with_usage(0) exit_with_usage(0)
elif opt == '--prefix': elif opt == '--prefix':
print sysconfig.PREFIX print(sysconfig.PREFIX)
elif opt == '--exec-prefix': elif opt == '--exec-prefix':
print sysconfig.EXEC_PREFIX print(sysconfig.EXEC_PREFIX)
elif opt in ('--includes', '--cflags'): elif opt in ('--includes', '--cflags'):
flags = ['-I' + sysconfig.get_python_inc(), flags = ['-I' + sysconfig.get_python_inc(),
'-I' + sysconfig.get_python_inc(plat_specific=True)] '-I' + sysconfig.get_python_inc(plat_specific=True)]
if opt == '--cflags': if opt == '--cflags':
flags.extend(getvar('CFLAGS').split()) flags.extend(getvar('CFLAGS').split())
print ' '.join(flags) print(' '.join(flags))
elif opt in ('--libs', '--ldflags'): elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split() libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@ -49,5 +49,5 @@ elif opt in ('--libs', '--ldflags'):
# shared library in prefix/lib/. # shared library in prefix/lib/.
if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL')) libs.insert(0, '-L' + getvar('LIBPL'))
print ' '.join(libs) print(' '.join(libs))

4
src/mod/applications/mod_avmd/mod_avmd.c
View File

@ -1343,8 +1343,10 @@ static switch_status_t avmd_parse_cmd_data(avmd_session_t *s, const char *cmd_da
switch_assert(argv[idx]); switch_assert(argv[idx]);
status = avmd_parse_cmd_data_one_entry(argv[idx], &settings); status = avmd_parse_cmd_data_one_entry(argv[idx], &settings);
if (status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(s->session), SWITCH_LOG_ERROR, if (argv[idx]) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(s->session), SWITCH_LOG_ERROR,
"Error parsing option [%d] [%s]\n", idx + 1, argv[idx]); /* idx + 1 to report option 0 as 1 for users convenience */ "Error parsing option [%d] [%s]\n", idx + 1, argv[idx]); /* idx + 1 to report option 0 as 1 for users convenience */
}
switch (status) switch (status)
{ {
case SWITCH_STATUS_TERM: case SWITCH_STATUS_TERM: