diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-02-16 16:30:00 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-02-21 11:24:53 +0000 |
| commit | d90430953c508670a67de68de400fef44f5e9fba (patch) | |
| tree | f9c3e3527e7042b55f98b35f55b7ab4f53582af8 /main/Makefile | |
| parent | 557ef67690e57b11b8d99f9c7cfa67376890dd49 (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.
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
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index a51b48bb1..b3e84e16c 100644 --- a/main/Makefile +++ b/main/Makefile @@ -355,7 +355,11 @@ else # Darwin endif endif ifneq ($(LDCONFIG),) +ifneq ($(DESTDIR),) $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/" +else + $(LDCONFIG) +endif endif $(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk" @@ -373,7 +377,11 @@ ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.) rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)" endif ifneq ($(LDCONFIG),) +ifneq ($(DESTDIR),) $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/" +else + $(LDCONFIG) +endif endif clean:: |