[svn-commits] qwell: branch 1.6.0 r227373 - in /branches/1.6.0: ./ Makefile main/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Nov  3 14:00:27 2009
New Revision: 227373

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

........
  r227372 | qwell | 2009-11-03 13:59:46 -0600 (Tue, 03 Nov 2009) | 9 lines
  
  Fix some build issues on Solaris.
  
  (closes issue #14517)
  (SWP-109)
  Reported by: asgaroth
  Patches:
        bug_14517.diff uploaded by snuffy (license 35)
  Tested by: asgaroth, snuffy, dougm, qwell
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/main/Makefile

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

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=227373&r1=227372&r2=227373
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Tue Nov  3 14:00:27 2009
@@ -271,7 +271,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
+  _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
 endif
 
 ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)

Modified: branches/1.6.0/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=227373&r1=227372&r2=227373
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Tue Nov  3 14:00:27 2009
@@ -91,7 +91,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
+  AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
   ASTLINK=
 endif