pjproject_bundled: Fix use of LDCONFIG for shared library link creation

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
changes/17/2517/1
George Joseph 10 years ago
parent 23d2a561d5
commit 304f81780d

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

Loading…
Cancel
Save