Attachment 214274 Details for Bug 246300 – asterisk16-full.diff

[patch] asterisk16-full.diff

asterisk16-full.diff (text/plain), 5.22 KB, created by Dmitry Wagin on 2020-05-08 12:49:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2020-05-08 12:49:06 UTC

Size: 5.22 KB

patch

obsolete

>Index: net/asterisk16/Makefile
>===================================================================
>--- net/asterisk16/Makefile	(revision 534296)
>+++ net/asterisk16/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	asterisk
> PORTVERSION=	16.10.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
> 		http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP
>@@ -64,9 +64,10 @@
> 
> OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
> 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
>-				SPANDSP SRTP SYSINFO XMPP
>+				SPANDSP SRTP SYSINFO URIPARSER XMPP
> OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC MYSQL PGSQL \
>-				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP VORBIS
>+				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP VORBIS \
>+				URIPARSER
> 
> OPTIONS_DEFINE_i386=		DAHDI
> OPTIONS_DEFINE_amd64=		DAHDI
>@@ -108,6 +109,7 @@
> PJSIP_DESC?=	Build the PJSIP based SIP channel
> SRTP_DESC?=	SecureRTP support
> SYSINFO_DESC?=	Use devel/libsysinfo to get system information
>+URIPARSER_DESC?= Strictly RFC 3986 compliant URI parsing
> XMPP_DESC?=	XMPP/GTALK support
> 
> OPTIONS_SUB=		yes
>@@ -116,12 +118,10 @@
> 
> BACKTRACE_CONFIGURE_WITH=	execinfo
> 
>-CURL_CONFIGURE_ON=	--with-libcurl
>-CURL_CONFIGURE_OFF=	--with-libcurl=no
>+CURL_CONFIGURE_WITH=	libcurl
> CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
> 
>-DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
>-DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
>+DAHDI_CONFIGURE_WITH=	dahdi openr2
> DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
> 			libopenr2.so:misc/openr2 \
> 			libtonezone.so:misc/dahdi
>@@ -202,6 +202,9 @@
> VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
> 			libogg.so:audio/libogg
> 
>+URIPARSER_CONFIGURE_WITH=	uriparser
>+URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
>+
> XMPP_CONFIGURE_WITH=	iksemel
> XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
> 
>@@ -243,6 +246,7 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
>+	@${CP} ${FILESDIR}/0050-fix-race-parallel-build.patch ${WRKSRC}/third-party/pjproject/patches/
> .if exists(${FILESDIR}/.asterisk.makeopts)
> 	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
> .endif
>Index: net/asterisk16/files/0050-fix-race-parallel-build.patch
>===================================================================
>--- net/asterisk16/files/0050-fix-race-parallel-build.patch	(nonexistent)
>+++ net/asterisk16/files/0050-fix-race-parallel-build.patch	(working copy)
>@@ -0,0 +1,59 @@
>+diff --git a/build/rules.mak b/build/rules.mak
>+index 8fa98655e..912199c41 100644
>+--- a/build/rules.mak
>++++ b/build/rules.mak
>+@@ -129,7 +129,7 @@ endif
>+ $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
>+ 	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
>+ 
>+-$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
>++$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS)
>+ 	@echo Creating kbuild Makefile...
>+ 	@echo "# Our module name:" > $(OBJDIR)/Makefile
>+ 	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
>+@@ -154,27 +154,27 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
>+ ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
>+ 	cp $(OBJDIR)/$(app).ko ../lib
>+ 
>+-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m
>++$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS)
>+ 	$(CC) $($(APP)_CFLAGS) \
>+ 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
>+ 		$(subst /,$(HOST_PSEP),$<) 
>+ 
>+-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
>++$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS)
>+ 	$(CC) $($(APP)_CFLAGS) \
>+ 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
>+ 		$(subst /,$(HOST_PSEP),$<) 
>+ 
>+-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
>++$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS)
>+ 	$(CC) $($(APP)_CFLAGS) \
>+ 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
>+ 		$(subst /,$(HOST_PSEP),$<) 
>+ 
>+-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
>++$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS)
>+ 	$(CXX) $($(APP)_CXXFLAGS) \
>+ 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
>+ 		$(subst /,$(HOST_PSEP),$<)
>+ 
>+-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc
>++$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS)
>+ 	$(CXX) $($(APP)_CXXFLAGS) \
>+ 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
>+ 		$(subst /,$(HOST_PSEP),$<)
>+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
>+index b85c7817a..20777909f 100644
>+--- a/pjsip/build/Makefile
>++++ b/pjsip/build/Makefile
>+@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL
>+ 
>+ pjsua2-lib: $(PJSUA2_LIB_LIB)
>+ $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
>+-$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
>++$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
>+ 	$(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
>+ 
>+ pjsip-test: $(TEST_EXE)
>
>Property changes on: net/asterisk16/files/0050-fix-race-parallel-build.patch
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 246300: 214257 | 214258 | 214259 | 214260 | 214272 | 214274