diff options
Diffstat (limited to 'net/asterisk16/files/patch-channels::Makefile')
| -rw-r--r-- | net/asterisk16/files/patch-channels::Makefile | 90 |
1 files changed, 21 insertions, 69 deletions
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile index 872026dfdca2..dbe7d0c7a0d2 100644 --- a/net/asterisk16/files/patch-channels::Makefile +++ b/net/asterisk16/files/patch-channels::Makefile @@ -3,10 +3,10 @@ $FreeBSD$ --- channels/Makefile.orig +++ channels/Makefile -@@ -48,8 +48,8 @@ +@@ -26,8 +26,8 @@ endif - ifeq (${OSARCH},FreeBSD) + ifeq ($(OSARCH),FreeBSD) - PTLIB=-lpt_FreeBSD_x86_r - H323LIB=-lh323_FreeBSD_x86_r + PTLIB=-lpt_r @@ -14,70 +14,22 @@ $FreeBSD$ CHANH323LIB=-pthread endif -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - +@@ -72,12 +72,12 @@ + 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) 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 + + gentone: gentone.c |