[svn-commits] tilghman: trunk r251475 - in /trunk: Makefile.rules codecs/gsm/Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Mar  9 14:30:03 2010
New Revision: 251475

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251475
Log:
Build system modifications to ensure that Asterisk properly builds on Mac OS X 10.6.

(closes issue #16997)
 Reported by: jquinn
 Patches: 
       20100309__issue16997__2.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman, russell

Modified:
    trunk/Makefile.rules
    trunk/codecs/gsm/Makefile

Modified: trunk/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile.rules?view=diff&rev=251475&r1=251474&r2=251475
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Tue Mar  9 14:30:03 2010
@@ -36,6 +36,12 @@
 endif
 
 OPTIMIZE?=-O6
+ifneq ($(findstring darwin,$(OSARCH)),)
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+    # Snow Leopard has an issue with this optimization flag on large files (like chan_sip)
+    OPTIMIZE+=-fno-inline-functions
+  endif
+endif
 
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     _ASTCFLAGS+=$(OPTIMIZE)

Modified: trunk/codecs/gsm/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/gsm/Makefile?view=diff&rev=251475&r1=251474&r2=251475
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Tue Mar  9 14:30:03 2010
@@ -40,7 +40,12 @@
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
 ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
 ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+# Wow... Snow Leopard is BROKEN!
+OPTIMIZE+=-mtune=native
+else
 OPTIMIZE+=-march=$(PROC)
+endif
 endif
 endif
 endif