sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "build: Warn if asterisk is installed in both 32 and 64 bit sys dirs"

This commit is contained in:
Joshua Colp 2017-02-28 17:47:46 -06:00 committed by Gerrit Code Review
parent 5e5aff04ec 4692a32ed7
commit 6d3c1a4a21
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile
View File

@ -652,6 +652,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\")."
@ -691,6 +722,7 @@ install: badshell bininstall datafiles
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
@$(MAKE) -s ld-cache-update
@$(MAKE) -s check-old-libdir
isntall: install
@ -911,6 +943,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)"
@ -943,6 +976,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)"
@ -1057,6 +1091,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)

12
main/Makefile
View File

@ -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