[Astlinux-commits] SF.net SVN: astlinux:[6924] branches/1.0/package/asterisk/asterisk.mk

[<abe...@us...>]

Revision: 6924
          http://sourceforge.net/p/astlinux/code/6924
Author:   abelbeck
Date:     2015-01-11 15:43:54 +0000 (Sun, 11 Jan 2015)
Log Message:
-----------
asterisk, when building 'menuselect' set LD_RUN_PATH at link time rather than LD_LIBRARY_PATH at runtime

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-01-11 14:38:27 UTC (rev 6923)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-01-11 15:43:54 UTC (rev 6924)
@@ -243,32 +243,32 @@
 		$(HOST_CONFIGURE_OPTS) \
 		./configure \
 	)
-	$(HOST_MAKE_ENV) \
+	$(HOST_MAKE_ENV) LD_RUN_PATH="$(HOST_DIR)/usr/lib" \
 	$(MAKE) -C $(ASTERISK_DIR)/menuselect menuselect
 ifeq ($(strip $(BR2_PACKAGE_ASTERISK_MENUSELECT)),y)
-	$(HOST_MAKE_ENV) \
+	$(HOST_MAKE_ENV) LD_RUN_PATH="$(HOST_DIR)/usr/lib" \
 	$(MAKE) -C $(ASTERISK_DIR) \
 		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS= \
 		menuselect
 else
-	$(HOST_MAKE_ENV) \
+	$(HOST_MAKE_ENV) LD_RUN_PATH="$(HOST_DIR)/usr/lib" \
 	$(MAKE) -C $(ASTERISK_DIR) \
 		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS= \
 		menuselect.makeopts
  ifeq ($(strip $(BR2_PACKAGE_MYSQL_CLIENT)),y)
-	(cd $(ASTERISK_DIR); $(HOST_MAKE_ENV) \
+	(cd $(ASTERISK_DIR); \
 		menuselect/menuselect --enable app_mysql --enable cdr_mysql --enable res_config_mysql menuselect.makeopts; \
 	)
  endif
  ifeq ($(strip $(BR2_PACKAGE_UW_IMAP)),y)
-	(cd $(ASTERISK_DIR); $(HOST_MAKE_ENV) \
+	(cd $(ASTERISK_DIR); \
 		menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts; \
 	)
  endif
  ifneq ($(ASTERISK_VERSION_SINGLE),1)
-	(cd $(ASTERISK_DIR); $(HOST_MAKE_ENV) \
+	(cd $(ASTERISK_DIR); \
 		menuselect/menuselect --enable app_meetme --enable app_page menuselect.makeopts; \
 	)
  endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.