diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-02-28 17:28:36 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-28 17:28:37 -0600 |
| commit | 4bff6bc144b8778e3f078e94f7a4ef011487d488 (patch) | |
| tree | f89102fbe466eee4038e2112ce0e40d369a0ba27 | |
| parent | 024e724acae903fc732a0c018a327cc3d89906c1 (diff) | |
| parent | 3d2c11977850ea5f8e87e22e141e5a42dd28cabd (diff) | |
Merge "build: Warn if asterisk is installed in both 32 and 64 bit sys dirs" into 13
| -rw-r--r-- | Makefile | 35 | ||||
| -rw-r--r-- | main/Makefile | 12 |
2 files changed, 37 insertions, 10 deletions
@@ -653,6 +653,37 @@ ifneq ($(LDCONFIG),) fi endif +ifeq ($(and $(findstring 64,$(HOST_CPU)),$(findstring lib64,$(DESTDIR)$(ASTLIBDIR))),lib64) +_oldlibdir = $(subst lib64,lib,$(DESTDIR)$(ASTLIBDIR)) + +check-old-libdir: + @oldfiles=`find "$(_oldlibdir)" -name libasterisk* -print -quit -o \( -path *asterisk/modules/* -a -name *.so \) -print -quit` ;\ + if [ "x$$oldfiles" != "x" ] ; then \ + echo " WARNING WARNING WARNING" ;\ + echo "" ;\ + echo " Installation is to: " ;\ + echo " $(DESTDIR)$(ASTLIBDIR)" ;\ + echo " but there are asterisk shared libraries in: " ;\ + echo " $(_oldlibdir)" ;\ + echo " or" ;\ + echo " $(_oldlibdir)/asterisk/modules" ;\ + echo "" ;\ + echo " It is unlikely that asterisk will start." ;\ + echo "" ;\ + echo " You should do one of the following..." ;\ + echo " * Run 'make uninstall' to remove the incorrect libraries" ;\ + echo " then run 'make install' again." ;\ + echo " * Manually remove the libraries from" ;\ + echo " $(_oldlibdir)" ;\ + echo " and run 'ldconfig' to rebuild the linker cache." ;\ + echo "" ;\ + echo " WARNING WARNING WARNING" ;\ + fi +else +check-old-libdir: + +endif + badshell: ifneq ($(filter ~%,$(DESTDIR)),) @echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")." @@ -692,6 +723,7 @@ install: badshell bininstall datafiles @echo " +-------------------------------------------+" @$(MAKE) -s oldmodcheck @$(MAKE) -s ld-cache-update + @$(MAKE) -s check-old-libdir isntall: install @@ -912,6 +944,7 @@ main-binuninstall: _uninstall: $(SUBDIRS_UNINSTALL) main-binuninstall rm -f "$(DESTDIR)$(ASTMODDIR)/"* + rm -f "$(subst lib64,lib,$(DESTDIR)$(ASTMODDIR))/"* rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey" rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport" rm -rf "$(DESTDIR)$(ASTHEADERDIR)" @@ -944,6 +977,7 @@ uninstall: _uninstall uninstall-all: _uninstall rm -rf "$(DESTDIR)$(ASTMODDIR)" + rm -rf "$(subst lib64,lib,$(DESTDIR)$(ASTMODDIR))" rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" @@ -1058,6 +1092,7 @@ check-alembic: makeopts .PHONY: basic-pbx .PHONY: check-alembic .PHONY: ld-cache-update +.PHONY: check-old-libdir .PHONY: $(SUBDIRS_INSTALL) .PHONY: $(SUBDIRS_DIST_CLEAN) .PHONY: $(SUBDIRS_CLEAN) diff --git a/main/Makefile b/main/Makefile index fb473141e..599803a10 100644 --- a/main/Makefile +++ b/main/Makefile @@ -359,16 +359,8 @@ endif binuninstall: rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)" rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk" -ifneq ($(ASTSSL_LIB).$(ASTSSL_SO_VERSION),.) -# ASTSSL_SO_VERSION may not exist on Darwin - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" || : - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)" -endif -ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.) -# ASTSSL_SO_VERSION may not exist on Darwin - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)" || : - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)" -endif + rm -f "$(DESTDIR)$(ASTLIBDIR)/libasterisk"* || : + rm -f "$(subst lib64,lib,$(DESTDIR)$(ASTLIBDIR))/libasterisk"* || : clean:: rm -f asterisk libasteriskssl.o |