FreeBSD Bugzilla – Attachment 214272 Details for
Bug 246300
net/asterisk16: Unstable build and add net/uriparser support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
asterisk16 patch
asterisk.diff (text/plain), 3.38 KB, created by
Guido Falsi
on 2020-05-08 10:45:12 UTC
(
hide
)
Description:
asterisk16 patch
Filename:
MIME Type:
Creator:
Guido Falsi
Created:
2020-05-08 10:45:12 UTC
Size:
3.38 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 534334) >+++ Makefile (working copy) >@@ -243,6 +243,8 @@ > > 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: files/0050-fix-race-parallel-build.patch >=================================================================== >--- files/0050-fix-race-parallel-build.patch (nonexistent) >+++ 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: 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 246300
:
214257
|
214258
|
214259
|
214260
|
214272
|
214274