[asterisk-commits] tilghman: branch 1.6.1 r251495 - in /branches/1.6.1: ./ codecs/gsm/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Mar  9 14:39:10 2010
New Revision: 251495

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251495
Log:
Merged revisions 251475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251475 | tilghman | 2010-03-09 14:30:03 -0600 (Tue, 09 Mar 2010) | 8 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile.rules
    branches/1.6.1/codecs/gsm/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile.rules?view=diff&rev=251495&r1=251494&r2=251495
==============================================================================
--- branches/1.6.1/Makefile.rules (original)
+++ branches/1.6.1/Makefile.rules Tue Mar  9 14:39:10 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: branches/1.6.1/codecs/gsm/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/codecs/gsm/Makefile?view=diff&rev=251495&r1=251494&r2=251495
==============================================================================
--- branches/1.6.1/codecs/gsm/Makefile (original)
+++ branches/1.6.1/codecs/gsm/Makefile Tue Mar  9 14:39:10 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