From 52cda4cb2c37a4c3db7d9058301f956531fc8abb Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Tue, 3 Nov 2009 20:01:04 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@227374 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 +- main/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8bc6098269..a4244ab952 100644 --- a/Makefile +++ b/Makefile @@ -273,7 +273,7 @@ ifeq ($(OSARCH),OpenBSD) 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 .) diff --git a/main/Makefile b/main/Makefile index 1f23938c42..0a4d849392 100644 --- a/main/Makefile +++ b/main/Makefile @@ -91,7 +91,7 @@ ifeq ($(OSARCH),OpenBSD) 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