[asterisk-commits] qwell: branch 1.4 r109973 - in /branches/1.4: ./ build_tools/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Mar 19 12:12:52 CDT 2008
Author: qwell
Date: Wed Mar 19 12:12:52 2008
New Revision: 109973
URL: http://svn.digium.com/view/asterisk?view=rev&rev=109973
Log:
People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...
Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)
Added:
branches/1.4/build_tools/cflags-devmode.xml
- copied, changed from r109737, branches/1.4/build_tools/cflags.xml
Modified:
branches/1.4/Makefile
branches/1.4/build_tools/cflags.xml
Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=109973&r1=109972&r2=109973
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Mar 19 12:12:52 2008
@@ -756,7 +756,7 @@
menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
@echo "Generating input for menuselect ..."
@echo "<?xml version=\"1.0\"?>" > $@
@echo >> $@
@@ -764,6 +764,9 @@
@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
@cat build_tools/cflags.xml >> $@
+ @if [ "${AST_DEVMODE}" = "yes" ]; then \
+ cat build_tools/cflags-devmode.xml >> $@; \
+ fi
@cat build_tools/embed_modules.xml >> $@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
Copied: branches/1.4/build_tools/cflags-devmode.xml (from r109737, branches/1.4/build_tools/cflags.xml)
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/cflags-devmode.xml?view=diff&rev=109973&p1=branches/1.4/build_tools/cflags.xml&r1=109737&p2=branches/1.4/build_tools/cflags-devmode.xml&r2=109973
==============================================================================
--- branches/1.4/build_tools/cflags.xml (original)
+++ branches/1.4/build_tools/cflags-devmode.xml Wed Mar 19 12:12:52 2008
@@ -1,9 +1,5 @@
- <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
- <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
- </member>
+ <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
- </member>
- <member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
</member>
<member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
</member>
@@ -12,23 +8,10 @@
</member>
<member name="DO_CRASH" displayname="Crash on fatal errors">
</member>
- <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
- </member>
<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
- </member>
- <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
- </member>
- <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
</member>
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
</member>
- <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
- </member>
<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
</member>
- <member name="STATIC_BUILD" displayname="Build static binaries">
- </member>
- <member name="LOADABLE_MODULES" displayname="Runtime module loading">
- <defaultenabled>yes</defaultenabled>
- </member>
</category>
Modified: branches/1.4/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/cflags.xml?view=diff&rev=109973&r1=109972&r2=109973
==============================================================================
--- branches/1.4/build_tools/cflags.xml (original)
+++ branches/1.4/build_tools/cflags.xml Wed Mar 19 12:12:52 2008
@@ -1,30 +1,15 @@
<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
+ <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
+ </member>
<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
</member>
- <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
- </member>
<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
- </member>
- <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
- </member>
- <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
- <depend>DEBUG_THREADS</depend>
- </member>
- <member name="DO_CRASH" displayname="Crash on fatal errors">
- </member>
- <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
- </member>
- <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
</member>
<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
</member>
<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
</member>
- <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
- </member>
<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
- </member>
- <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
</member>
<member name="STATIC_BUILD" displayname="Build static binaries">
</member>
More information about the asterisk-commits
mailing list