diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2020-05-08 15:10:37 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2020-05-08 15:10:37 +0000 |
| commit | b170dabf13a2023860746d65914bb032612ddf81 (patch) | |
| tree | fffc572bac16a1f8025679ce988259e2aba8d437 /net/asterisk13 | |
| parent | e8fda2351286366eff23519ad280ab3dce7c163c (diff) | |
| download | ports-b170dabf13a2023860746d65914bb032612ddf81.tar.gz ports-b170dabf13a2023860746d65914bb032612ddf81.zip | |
Notes
Diffstat (limited to 'net/asterisk13')
| -rw-r--r-- | net/asterisk13/Makefile | 2 | ||||
| -rw-r--r-- | net/asterisk13/files/0050-fix-race-parallel-build.patch | 59 |
2 files changed, 61 insertions, 0 deletions
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index 5ce9a0498c5c..ef3773515dfb 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -241,6 +241,8 @@ post-extract-OPUS-on: 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 diff --git a/net/asterisk13/files/0050-fix-race-parallel-build.patch b/net/asterisk13/files/0050-fix-race-parallel-build.patch new file mode 100644 index 000000000000..da8ff8642cfb --- /dev/null +++ b/net/asterisk13/files/0050-fix-race-parallel-build.patch @@ -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) |