a couple Solaris tweaks, to help build properly.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2006-08-22 05:24:50 +00:00
parent 312ae9bbdb
commit 0264c362b6
5 changed files with 5 additions and 5 deletions

View File

@@ -177,7 +177,7 @@ ifeq ($(OSARCH),OpenBSD)
endif endif
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif endif
ASTERISKVERSION:=$(shell build_tools/make_version .) ASTERISKVERSION:=$(shell build_tools/make_version .)

View File

@@ -16,7 +16,7 @@
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
LIBS+=-lsocket -lnsl ../strcompat.o LIBS+=-lsocket -lnsl ../main/strcompat.o
endif endif
include $(ASTTOPDIR)/Makefile.rules include $(ASTTOPDIR)/Makefile.rules

View File

@@ -5,7 +5,7 @@ if [ -f ${1}/.version ]; then
elif [ -f ${1}/.svnrevision ]; then elif [ -f ${1}/.svnrevision ]; then
echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision` echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
elif [ -d .svn ]; then elif [ -d .svn ]; then
PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'` PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0 BRANCH=0
TEAM=0 TEAM=0

View File

@@ -54,7 +54,7 @@ CFLAGS+=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno
OSTYPE=$(shell uname -s) OSTYPE=$(shell uname -s)
ifeq ($(OSTYPE),SunOS) ifeq ($(OSTYPE),SunOS)
CFLAGS+=-I../include -I../include/solaris-compat -DSOLARIS CFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS
endif endif
db_dump185.o: db_dump185.c db_dump185.o: db_dump185.c

View File

@@ -27,7 +27,7 @@ INSTALL = @INSTALL@
PREFIX = @prefix@ PREFIX = @prefix@
ifeq ($(OSTYPE),SunOS) ifeq ($(OSTYPE),SunOS)
CFLAGS+=-DSOLARIS -I../include/solaris-compat CFLAGS+=-DSOLARIS -I../../include/solaris-compat
endif endif
# .c files. # .c files.