aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 20:01:04 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 20:01:04 +0000
commit130ceb2dcc3d3833bd713b65e67348cbb7622d1f (patch)
treee7170266c0e42fb00db67384d65b829318e48c39
parent1fca5ed1849f4dbcf810cb907c9c54e91b624e08 (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.1@227374 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile2
-rw-r--r--main/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8bc609826..a4244ab95 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 1f23938c4..0a4d84939 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