mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-29 05:38:00 +00:00
8a089d17c7
built-in h323 module; o don't link main binary with h323 library and friends. This creates issues with ooh323 module, from the asterisk-addons package. Bump PORTREVISION.
50 lines
1.6 KiB
Plaintext
50 lines
1.6 KiB
Plaintext
|
|
$FreeBSD$
|
|
|
|
--- channels/Makefile.orig
|
|
+++ channels/Makefile
|
|
@@ -32,8 +32,8 @@
|
|
endif
|
|
|
|
ifeq ($(OSARCH),FreeBSD)
|
|
- PTLIB=-lpt_FreeBSD_x86_r
|
|
- H323LIB=-lh323_FreeBSD_x86_r
|
|
+ PTLIB=-lpt_r
|
|
+ H323LIB=-lh323_r
|
|
CHANH323LIB=-pthread
|
|
endif
|
|
|
|
@@ -78,12 +78,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 +114,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)
|
|
+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
|
|
|