summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-02-16 16:30:00 +0000
committerJoshua Colp <jcolp@digium.com>2017-02-16 14:21:14 -0600
commit8851c3e0885cb704a5a6159a51768ea5297e9b10 (patch)
treeac8615f9b513c6b76f4649fcc27eb8103296ce31
parentab34e46b3a5ed53d3a28dfc7d38762691ddccf37 (diff)
build: Execute ldconfig to build cache.
On some platforms a multiarch approach is used for libraries. The build system does not take this into account and still places libraries into the lib directory if no --libdir is specified to configure. On initial startup this results in libasteriskssl.so not being found, as it is not in the multiarch lib directory. This change does the minimally invasive thing and executes ldconfig so that the libraries in the lib directory are found and their location cached. By doing so Asterisk starts up fine. ASTERISK-26705 Change-Id: I6d30b6427e9d5e69470e11327c7ff203fa7da519
-rw-r--r--main/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile
index 4d1b2c41b..331da845c 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -355,7 +355,7 @@ else # Darwin
endif
endif
ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+ $(LDCONFIG)
endif
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
@@ -373,7 +373,7 @@ ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.)
rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
endif
ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+ $(LDCONFIG)
endif
clean::