diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 20:00:27 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 20:00:27 +0000 |
| commit | 5bde712d475868756112212dbae4e232bff750c9 (patch) | |
| tree | 121ed3565ab6ec01b8142098d1c7f6c732641818 | |
| parent | 8848393114095b2777e2875f11d9c028e329b0b5 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@227373 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | main/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -271,7 +271,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 f147abd66..f9c54b73c 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 |