From: Mike Jerris Date: Wed, 31 Oct 2018 19:10:53 +0000 (-0400) Subject: FS-11494: [Debian] force build of iksemel before modules to avoid -j race condition... X-Git-Tag: v1.8.3~1^2~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b3bb586b55370bea9df59c8a482b9b879fa794;p=thirdparty%2Ffreeswitch.git FS-11494: [Debian] force build of iksemel before modules to avoid -j race condition on dep lib build --- diff --git a/Makefile.am b/Makefile.am index 9edfbba65f..dcfee8161b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -698,6 +698,9 @@ nodepends: .nodepends yesdepends: rm .nodepends +iksemel-dep: + make -C src/mod/endpoints/mod_dingaling deps + core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la diff --git a/debian/rules b/debian/rules index b403d0aecc..bb0e56f2c0 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,8 @@ override_dh_auto_configure: .stamp-configure .stamp-build: .stamp-configure @$(call show_vars) + make -j$(NJOBS) core + make iksemel-dep make -j$(NJOBS) make -C libs/esl pymod make -C libs/esl perlmod diff --git a/src/mod/endpoints/mod_dingaling/Makefile.am b/src/mod/endpoints/mod_dingaling/Makefile.am index d19cf41bdf..3412a3ef59 100644 --- a/src/mod/endpoints/mod_dingaling/Makefile.am +++ b/src/mod/endpoints/mod_dingaling/Makefile.am @@ -20,3 +20,5 @@ BUILT_SOURCES=$(IKS_LA) $(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update @cd $(IKS_BUILDDIR) && $(MAKE) @$(TOUCH_TARGET) + +deps: $(IKS_LA) \ No newline at end of file