[Asterisk-code-review] build: Execute ldconfig to build cache. (asterisk[14])
Joshua Colp
asteriskteam at digium.com
Tue Feb 21 05:23:59 CST 2017
Joshua Colp has uploaded a new change for review. ( https://gerrit.asterisk.org/5043 )
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.
If DESTDIR is specified, however, the old logic is executed as
the install process may not have permission to alter the ldconfig
cache.
ASTERISK-26705
Change-Id: If4eca46ac510c6fea5568256280ffdb3888d7bb4
---
M main/Makefile
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/43/5043/1
diff --git a/main/Makefile b/main/Makefile
index 4d1b2c4..c693134 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -355,7 +355,10 @@
endif
endif
ifneq ($(LDCONFIG),)
+ifneq ($(DESTDIR),)
$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+else
+ $(LDCONFIG)
endif
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
@@ -373,7 +376,10 @@
rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
endif
ifneq ($(LDCONFIG),)
+ifneq ($(DESTDIR),)
$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
+else
+ $(LDCONFIG)
endif
clean::
--
To view, visit https://gerrit.asterisk.org/5043
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4eca46ac510c6fea5568256280ffdb3888d7bb4
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
More information about the asterisk-code-review
mailing list