kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjproject_bundled: Fix use of LDCONFIG for shared library link creation

Browse Source 
LDCONFIG apparently isn't set to something sane on all systems so the creation
of the shared library links fails.  Instead of just testing for non-blank,
main/Makefile now checks that LDCONFIG is actually executable and reverts to
LN if it isn't.

This applies to both libasteriskpj and libasteriskssl.

Thanks to 'abelbeck' for pointing out that the issue was LDCONFIG.

ASTERISK-25873 #close
Reported-by: Hans van Eijsden

Change-Id: I25b76379bc637726ec044b2c0e709b56b3701729
This commit is contained in:
George Joseph
2016-03-30 17:34:42 -06:00
parent e1fdb0a6da
commit 964f54bd5d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/Makefile
View File

@@ -224,11 +224,11 @@ endif
$(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
$(ECHO_PREFIX) echo " [LN] $< -> $@" $(ECHO_PREFIX) echo " [LN] $< -> $@"
ifneq ($(LDCONFIG),) $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
else else \
$(CMD_PREFIX) $(LN) -sf $< $@ $(LN) -sf $< $@ ;\
endif fi
else # Darwin else # Darwin
ASTSSL_LIB:=libasteriskssl.dylib ASTSSL_LIB:=libasteriskssl.dylib
@@ -304,11 +304,11 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libasteriskpj.o libasteriskpj.exports
$(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION)
$(ECHO_PREFIX) echo " [LN] $< -> $@" $(ECHO_PREFIX) echo " [LN] $< -> $@"
ifneq ($(LDCONFIG),) $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
else else \
$(CMD_PREFIX) $(LN) -sf $< $@ $(LN) -sf $< $@ ;\
endif fi
else # Darwin else # Darwin
ASTPJ_LIB:=libasteriskpj.dylib ASTPJ_LIB:=libasteriskpj.dylib