retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-11494: [Debian] force build of iksemel before modules to avoid -j race condition on dep lib build

This commit is contained in:
Mike Jerris 2018-10-31 15:10:53 -04:00
parent 50032af938
commit 76b3bb586b
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -698,6 +698,9 @@ nodepends: .nodepends
yesdepends: yesdepends:
rm .nodepends rm .nodepends
iksemel-dep:
make -C src/mod/endpoints/mod_dingaling deps
core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS)
$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la

2
debian/rules vendored
View File

@ -82,6 +82,8 @@ override_dh_auto_configure: .stamp-configure
.stamp-build: .stamp-configure .stamp-build: .stamp-configure
@$(call show_vars) @$(call show_vars)
make -j$(NJOBS) core
make iksemel-dep
make -j$(NJOBS) make -j$(NJOBS)
make -C libs/esl pymod make -C libs/esl pymod
make -C libs/esl perlmod make -C libs/esl perlmod

2
src/mod/endpoints/mod_dingaling/Makefile.am
View File

@ -20,3 +20,5 @@ BUILT_SOURCES=$(IKS_LA)
$(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update $(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update
@cd $(IKS_BUILDDIR) && $(MAKE) @cd $(IKS_BUILDDIR) && $(MAKE)
@$(TOUCH_TARGET) @$(TOUCH_TARGET)
deps: $(IKS_LA)