diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
| commit | 08acf5c407242344b0047b8040900f52df620dde (patch) | |
| tree | 49936ec28d8b2a4256959f13245d757df97e04bd /net/asterisk14/files/patch-channels::Makefile | |
| parent | Upgrade to version 2.4.0. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_3_0'.release/7.3.0
Diffstat (limited to 'net/asterisk14/files/patch-channels::Makefile')
| -rw-r--r-- | net/asterisk14/files/patch-channels::Makefile | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile deleted file mode 100644 index fa5a90a988fa..000000000000 --- a/net/asterisk14/files/patch-channels::Makefile +++ /dev/null @@ -1,51 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -32,9 +32,10 @@ - endif - - ifeq ($(OSARCH),FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -+ PTLIB=-lpt_r -+ H323LIB=-lh323_r - CHANH323LIB=-pthread -+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) - endif - - ifeq ($(OSARCH),NetBSD) -@@ -78,12 +79,13 @@ - h323/libchanh323.a h323/Makefile.ast: - $(CMD_PREFIX) $(MAKE) -C h323 - $(CMD_PREFIX) rm -f ../main/asterisk -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) exit 1 -+ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) exit 1 - endif - - dist-clean:: -@@ -113,8 +115,12 @@ - else - chan_h323.so: chan_h323.o h323/libchanh323.a - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -+ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) -+else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat - endif -+endif - - chan_misdn.o: ASTCFLAGS+=-Imisdn - |