From e8fda2351286366eff23519ad280ab3dce7c163c Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Fri, 8 May 2020 15:09:26 +0000
Subject: [PATCH] Add patches fixing race condition in build system. This
 allows removing MAKE_JOBS_UNSAFE.

PR:		246300
Submitted by:	Dmitry Wagin <dmitry.wagin@ya.ru>
---
 net/pjsip/Makefile                         |  1 -
 net/pjsip/files/patch-build_rules.mak      | 44 ++++++++++++++++++++++
 net/pjsip/files/patch-pjsip_build_Makefile | 11 ++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 net/pjsip/files/patch-build_rules.mak
 create mode 100644 net/pjsip/files/patch-pjsip_build_Makefile

diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index 0ff10a68cbc8..2b2a9659860a 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ARGS=	--with-external-pa \
 		--disable-silk
 PATHFIX_MAKEFILEIN=	Makefile
 PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \
 		L16 OPENH264 OPUS PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \
diff --git a/net/pjsip/files/patch-build_rules.mak b/net/pjsip/files/patch-build_rules.mak
new file mode 100644
index 000000000000..caa251e16df3
--- /dev/null
+++ b/net/pjsip/files/patch-build_rules.mak
@@ -0,0 +1,44 @@
+--- build/rules.mak.orig	2020-02-14 09:48:27 UTC
++++ 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/net/pjsip/files/patch-pjsip_build_Makefile b/net/pjsip/files/patch-pjsip_build_Makefile
new file mode 100644
index 000000000000..f144c89883a4
--- /dev/null
+++ b/net/pjsip/files/patch-pjsip_build_Makefile
@@ -0,0 +1,11 @@
+--- pjsip/build/Makefile.orig	2020-02-14 09:48:27 UTC
++++ pjsip/build/Makefile
+@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(P
+ 
+ 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) $(PSJUA_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)