[asterisk-commits] dlee: trunk r379495 - in /trunk: Makefile configure configure.ac main/Makefile

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Jan 18 16:42:38 2013
New Revision: 379495

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379495
Log:
Up the minimum OS X version to 10.6.

 * This allows us to remove some special-case build logic.
 * 10.5 is down to less that 8% of the OS X market share. 10.4 is down to 
   under 2%.
 * Apple is no longer releasing security updates for 10.5 and earlier.

Modified:
    trunk/Makefile
    trunk/configure
    trunk/configure.ac
    trunk/main/Makefile

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=379495&r1=379494&r2=379495
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jan 18 16:42:38 2013
@@ -252,10 +252,8 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
-  _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup
-  ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6)
-    _SOLINK+=/usr/lib/bundle1.o
-  endif
+  _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup
+  _SOLINK+=/usr/lib/bundle1.o
   SOLINK=-bundle $(_SOLINK)
   DYLINK=-Xlinker -dylib $(_SOLINK)
   _ASTLDFLAGS+=-L/usr/local/lib

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=379495&r1=379494&r2=379495
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jan 18 16:42:38 2013
@@ -1071,18 +1071,7 @@
 elif test "${prefix}" = /usr || test "${prefix}" = NONE; then
 	AC_MSG_RESULT(not needed)
 else
-	case "${host_os}" in
-		darwin*)
-			AC_MSG_RESULT(not supported)
-			# We set macosx_version_min to 10.4, which doesn't
-			# support rpath. However, we set install_name on our
-			# dylibs, so it's not strictly necessary.
-			;;
-		*)
-			AC_MSG_RESULT(required)
-			AST_RPATH="-Wl,-rpath,${libdir}"
-			;;
-	esac
+	AST_RPATH="-Wl,-rpath,${libdir}"
 fi
 AC_SUBST(AST_RPATH)
 

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=379495&r1=379494&r2=379495
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Jan 18 16:42:38 2013
@@ -55,10 +55,8 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   AST_LIBS+=-lresolv
-  ASTLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-  ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6)
-    ASTLINK+=/usr/lib/bundle1.o
-  endif
+  ASTLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ASTLINK+=/usr/lib/bundle1.o
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)