[asterisk-commits] build: Execute ldconfig to build cache. (asterisk[13])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Feb 17 12:15:41 CST 2017
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4981 )
Change subject: build: Execute ldconfig to build cache.
......................................................................
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
---
M main/Makefile
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, approved
George Joseph: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Scott Griepentrog: Looks good to me, but someone else must approve
diff --git a/main/Makefile b/main/Makefile
index a51b48b..da38a3e 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -355,7 +355,7 @@
endif
endif
ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+ $(LDCONFIG)
endif
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
@@ -373,7 +373,7 @@
rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
endif
ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+ $(LDCONFIG)
endif
clean::
--
To view, visit https://gerrit.asterisk.org/4981
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d30b6427e9d5e69470e11327c7ff203fa7da519
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Scott Griepentrog <sgriepentrog at digium.com>
More information about the asterisk-commits
mailing list