commit 8fdff7d40391287ccbcc1600d121bd7e43bd1414
Author: Jacek Konieczny <[email protected]>
Date: Thu Mar 30 15:59:25 2017 +0200
malloc_debug bcond fix
I hate this menuselect magic – --enable does not work as expected.
asterisk.spec | 7 +++----
menuselect.makeopts | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index 7d548e4..833f548 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -875,15 +875,14 @@ menuselect/menuselect --disable res_pjsip --disable
chan_pjsip menuselect.makeop
%if %{without opus_vp8}
menuselect/menuselect --disable codec_opus_open_source --disable
format_ogg_opus_open_source
%endif
+%if %{without malloc_debug}
+menuselect/menuselect --disable MALLOC_DEBUG
+%endif
%{__sed} -i -e
's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=FILE_STORAGE/'
menuselect.makeopts
menuselect/menuselect --enable app_voicemail menuselect.makeopts
-%if %{with malloc_debug}
-menuselect/menuselect --enable MALLOC_DEBUG
-%endif
-
# workaround for build failing with asterisk-devel not installed
ln -s libasteriskssl.so.1 ./main/libasteriskssl.so
diff --git a/menuselect.makeopts b/menuselect.makeopts
index 9fbbece..12f0318 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -10,7 +10,7 @@ MENUSELECT_FUNCS=
MENUSELECT_PBX=
MENUSELECT_RES=res_stasis_mailbox res_stasis_test res_timing_kqueue
MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app
test_ari test_ari_model test_ast_format_str_reduce test_astobj2
test_astobj2_thrash test_bucket test_callerid test_cdr test_cel
test_channel_feature_hooks test_config test_core_codec test_core_format test_db
test_devicestate test_dlinklists test_endpoints test_event test_expr
test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash
test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger
test_message test_netsock2 test_optional_api test_pbx test_poll test_res_stasis
test_sched test_scoped_lock test_security_events test_skel test_sorcery
test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels
test_stasis_endpoints test_stringfields test_strings test_substitution
test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid
test_voicemail_api test_websocket_client test_xml_escape
-MENUSELECT_CFLAGS=LOADABLE_MODULES BUILD_NATIVE OPTIONAL_API
+MENUSELECT_CFLAGS=LOADABLE_MODULES BUILD_NATIVE OPTIONAL_API MALLOC_DEBUG
MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael
muted smsq stereorize streamplayer
MENUSELECT_AGIS=
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/8fdff7d40391287ccbcc1600d121bd7e43bd1414
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
