kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't hardcode poll.o for Darwin

Browse Source 
fix incorrect portion of patch from yesterday's Solaris fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-21 13:21:18 +00:00
parent f367620dd9
commit ee5bc3ce65
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2005-11-21 Russell Bryant <russell@digium.com> 2005-11-21 Russell Bryant <russell@digium.com>
* Makefile: Don't hard-code that poll functionality needs to be provided on Darwin.
* apps/Makefile: Fix incorrect portion of the patch to fix 'make install' on Solaris.
* channels/chan_iax2.c (iax2_getpeername): Return non-zero to indicate that a peer was found when using realtime (issue #5815) * channels/chan_iax2.c (iax2_getpeername): Return non-zero to indicate that a peer was found when using realtime (issue #5815)
2005-11-20 Russell Bryant <russell@digium.com> 2005-11-20 Russell Bryant <russell@digium.com>

2
Makefile
View File

@@ -363,8 +363,6 @@ ifeq ($(OSARCH),Darwin)
AUDIO_LIBS=-framework CoreAudio AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
OBJS+=poll.o
ASTCFLAGS+=-DPOLLCOMPAT
else else
#These are used for all but Darwin #These are used for all but Darwin
ASTLINK=-Wl,-E ASTLINK=-Wl,-E

2
apps/Makefile
View File

@@ -59,7 +59,7 @@ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/us
endif endif
CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
ifneq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),) ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
ifneq (${CURLLIBS},) ifneq (${CURLLIBS},)
APPS+=app_curl.so APPS+=app_curl.so
endif endif