Attachment #214272 for bug #246300

Lines 243-248 Link Here

(-)Makefile (+2 lines)
243		243
244	post-patch:	244	post-patch:
245	@${REINPLACE_CMD} -e 's\|/var/lib\|${PREFIX}/share\|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample	245	@${REINPLACE_CMD} -e 's\|/var/lib\|${PREFIX}/share\|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
		246	@${CP} ${FILESDIR}/0050-fix-race-parallel-build.patch \
		247	${WRKSRC}/third-party/pjproject/patches/
246	.if exists(${FILESDIR}/.asterisk.makeopts)	248	.if exists(${FILESDIR}/.asterisk.makeopts)
247	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts	249	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
248	.endif	250	.endif




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)

Return to bug 246300

Line 0 Link Here

(-)files/0050-fix-race-parallel-build.patch (+59 lines)
	1	diff --git a/build/rules.mak b/build/rules.mak
	2	index 8fa98655e..912199c41 100644
	3	--- a/build/rules.mak
	4	+++ b/build/rules.mak
	5	@@ -129,7 +129,7 @@ endif
	6	$(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
	7	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
	8
	9	-$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
	10	+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o \| $(OBJDIRS)
	11	@echo Creating kbuild Makefile...
	12	@echo "# Our module name:" > $(OBJDIR)/Makefile
	13	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
	14	@@ -154,27 +154,27 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
	15	../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
	16	cp $(OBJDIR)/$(app).ko ../lib
	17
	18	-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m
	19	+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m \| $(OBJDIRS)
	20	$(CC) $($(APP)_CFLAGS) \
	21	$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
	22	$(subst /,$(HOST_PSEP),$<)
	23
	24	-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
	25	+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c \| $(OBJDIRS)
	26	$(CC) $($(APP)_CFLAGS) \
	27	$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
	28	$(subst /,$(HOST_PSEP),$<)
	29
	30	-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
	31	+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S \| $(OBJDIRS)
	32	$(CC) $($(APP)_CFLAGS) \
	33	$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
	34	$(subst /,$(HOST_PSEP),$<)
	35
	36	-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
	37	+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp \| $(OBJDIRS)
	38	$(CXX) $($(APP)_CXXFLAGS) \
	39	$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
	40	$(subst /,$(HOST_PSEP),$<)
	41
	42	-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc
	43	+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc \| $(OBJDIRS)
	44	$(CXX) $($(APP)_CXXFLAGS) \
	45	$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
	46	$(subst /,$(HOST_PSEP),$<)
	47	diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
	48	index b85c7817a..20777909f 100644
	49	--- a/pjsip/build/Makefile
	50	+++ b/pjsip/build/Makefile
	51	@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL
	52
	53	pjsua2-lib: $(PJSUA2_LIB_LIB)
	54	$(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
	55	-$(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)
	56	+$(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)
	57	$(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
	58
	59	pjsip-test: $(TEST_EXE)