summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2017-02-23 14:49:17 -0700
committerGeorge Joseph <gjoseph@digium.com>2017-02-23 16:07:29 -0600
commitb0067bcf2c64660e3499f8d2f06e7874ab627898 (patch)
tree1a7c2c5c8ec837c94b58fd36bbf5a5cf382ec9e5 /Makefile
parent25688ab79743dd31a1db2e0d7eeb3dc9443bf94b (diff)
build: Execute ldconfig to build cache. (take two)
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. To make matters worse, options were being passed to ldconfig on both Linux and FreeBSD that actually prevented the rebuild of the cache. * Fedora has a /usr/share/config.site that automatically tells autoconf to use /usr/lib64 but CentOS does not. This logic was copied to configure.ac and modified so systems like Ubuntu, which still use /usr/lib for 64-bit systems, aren't affected. Now that we have them in the correct directory... In order for the system loader to find libasteriskssl and libasteriskpj, one of 3 things has to happen... - The linker cache must be rebuilt including the directory where the libasterisk* libraries were installed. Only root can rebuild the cache. This was busted. - We have to link the asterisk binary with an rpath pointing to the directrory where the libasterisk* libraries were installed. This makes things very complicated and will happen over the collective dead bodies of everyone who's had to package a distribution with an rpath. - Finally, you can start asterisk with LD_LIBRARY_PATH set to the directrory where the libasterisk* libraries were installed. There are no other options. So... * The invokation of ldconfig has been moved from main/Makefile to ASTTOPDIR/Makefile, the options have been removed, and DESTDIR/ASTLIBDIR appended. If you aren't root, you will be warned after the "Asterisk Installation Compete" banner that you must re-run 'make install' as root, manually run 'ldconfig DESTDIR/ASTLIBDIR' as root, or run asterisk with LD_LIBRARY_PATH. ASTERISK-26705 Change-Id: I2a64b7c33a7d3e9bde20f47e3d3ab771977af982
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 22 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8e237e1fd..80845d5ab 100644
--- a/Makefile
+++ b/Makefile
@@ -182,11 +182,6 @@ OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
# Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
OPTIONS=
-ifeq ($(OSARCH),linux-gnu)
- # flag to tell 'ldconfig' to only process specified directories
- LDCONFIG_FLAGS=-n
-endif
-
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
_ASTCFLAGS+=-pipe
@@ -222,8 +217,6 @@ ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
- # flag to tell 'ldconfig' to only process specified directories
- LDCONFIG_FLAGS=-m
endif
ifeq ($(OSARCH),NetBSD)
@@ -642,6 +635,23 @@ oldmodcheck:
echo " WARNING WARNING WARNING" ;\
fi
+ld-cache-update:
+ifneq ($(LDCONFIG),)
+ @if [ $${EUID} -eq 0 ] ; then \
+ $(LDCONFIG) "$(DESTDIR)$(ASTLIBDIR)/" ; \
+ else \
+ echo " WARNING WARNING WARNING" ;\
+ echo "" ;\
+ echo " You cannot rebuild the system linker cache unless you are root. " ;\
+ echo " You MUST do one of the follwing..." ;\
+ echo " * Re-run 'make install' as root. " ;\
+ echo " * Run 'ldconfig $(DESTDIR)$(ASTLIBDIR)' as root. " ;\
+ echo " * Run asterisk with 'LD_LIBRARY_PATH=$(DESTDIR)$(ASTLIBDIR) asterisk' " ;\
+ echo "" ;\
+ echo " WARNING WARNING WARNING" ;\
+ fi
+endif
+
badshell:
ifneq ($(filter ~%,$(DESTDIR)),)
@echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
@@ -680,6 +690,7 @@ install: badshell bininstall datafiles
@echo " + doxygen installed on your local system +"
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
+ @$(MAKE) -s ld-cache-update
isntall: install
@@ -912,6 +923,9 @@ ifeq ($(HAVE_DAHDI),1)
rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
endif
$(MAKE) -C sounds uninstall
+ifneq ($(LDCONFIG),)
+ $(LDCONFIG) || :
+endif
uninstall: _uninstall
@echo " +--------- Asterisk Uninstall Complete -----+"
@@ -1042,6 +1056,7 @@ check-alembic: makeopts
.PHONY: ari-stubs
.PHONY: basic-pbx
.PHONY: check-alembic
+.PHONY: ld-cache-update
.PHONY: $(SUBDIRS_INSTALL)
.PHONY: $(SUBDIRS_DIST_CLEAN)
.PHONY: $(SUBDIRS_CLEAN)