improvements to malloc_debug bcond

diff --git a/asterisk.spec b/asterisk.spec
index 761729f03221749c1c57dbb690af4ae6d2c2abed..58255fa69b797b4de584609f12e8536bd8b71a99 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -876,7 +876,9 @@ menuselect/menuselect --disable res_pjsip --disable chan_pjsip menuselect.makeop
 menuselect/menuselect --disable codec_opus_open_source --disable format_ogg_opus_open_source menuselect.makeopts
 %endif
 
 menuselect/menuselect --disable codec_opus_open_source --disable format_ogg_opus_open_source menuselect.makeopts
 %endif
 

-%if %{without malloc_debug}
+%if %{with malloc_debug}
+menuselect/menuselect --enable MALLOC_DEBUG menuselect.makeopts
+%else

 menuselect/menuselect --disable MALLOC_DEBUG menuselect.makeopts
 %endif
 
 menuselect/menuselect --disable MALLOC_DEBUG menuselect.makeopts
 %endif
 


@@ -884,6 +886,8 @@ menuselect/menuselect --disable MALLOC_DEBUG menuselect.makeopts
 
 menuselect/menuselect --enable app_voicemail menuselect.makeopts
 
 
 menuselect/menuselect --enable app_voicemail menuselect.makeopts
 

+menuselect/menuselect --check-deps menuselect.makeopts
+

 # workaround for build failing with asterisk-devel not installed
 ln -s libasteriskssl.so.1 ./main/libasteriskssl.so
 
 # 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 5dcadf8b01495d2a73bae4d6e2d9d986e2a328b2..5d12ae89ceee6a90b20dc34b53797f32d57245d0 100644 (file)
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -10,7 +10,7 @@ MENUSELECT_FUNCS=
 MENUSELECT_PBX=
 MENUSELECT_RES=res_ari_mailboxes res_stasis_mailbox res_stasis_test res_timing_kqueue res_digium_phone 
 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_file 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_named_lock test_netsock2 test_optional_api test_pbx test_poll test_res_pjsip_scheduler test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_memory_cache_thrash 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_vector test_voicemail_api test_websocket_client test_xml_escape 
 MENUSELECT_PBX=
 MENUSELECT_RES=res_ari_mailboxes res_stasis_mailbox res_stasis_test res_timing_kqueue res_digium_phone 
 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_file 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_named_lock test_netsock2 test_optional_api test_pbx test_poll test_res_pjsip_scheduler test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_memory_cache_thrash 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_vector test_voicemail_api test_websocket_client test_xml_escape 

-MENUSELECT_CFLAGS=LOADABLE_MODULES MALLOC_DEBUG BUILD_NATIVE OPTIONAL_API 
+MENUSELECT_CFLAGS=LOADABLE_MODULES BUILD_NATIVE OPTIONAL_API 

 MENUSELECT_OPTS_app_voicemail=FILE_STORAGE 
 MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael muted smsq stereorize streamplayer 
 MENUSELECT_AGIS=
 MENUSELECT_OPTS_app_voicemail=FILE_STORAGE 
 MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael muted smsq stereorize streamplayer 
 MENUSELECT_AGIS=