[asterisk-commits] pjproject bundled: Fix use of LDCONFIG for shared library l... (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: pjproject_bundled:  Fix use of LDCONFIG for shared library link creation
......................................................................


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
---
M main/Makefile
1 file changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, approved
  Joshua Colp: Looks good to me, but someone else must approve; Verified



diff --git a/main/Makefile b/main/Makefile
index 50fdc57..d52c3f0 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -225,11 +225,11 @@
 
 $(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_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

-- 
To view, visit https://gerrit.asterisk.org/2517
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I25b76379bc637726ec044b2c0e709b56b3701729
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>