Skip to contentSkip to conversation

asterisk: replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin

PATCH New Thomas De Schampheleire 2 participants 2 messages Feb 27, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 asterisk: replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin

Commit 0f9c0bf3d5cd did a global replace of $(HOST_DIR)/usr/bin to $(HOST_DIR)/bin. But later, a new occurrence of $(HOST_DIR)/usr/bin snuck into the sources via commit 05e306d8d33 which added asterisk.

---
 package/asterisk/asterisk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/asterisk/asterisk.mk +1 -1
index f14c008111..28b85da562 100644
@@ -287,7 +287,7 @@ HOST_ASTERISK_LICENSE_FILES = COPYING
 # so do not inherit the target setup.
 HOST_ASTERISK_AUTORECONF = NO
 
-HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/usr/bin/xml2-config
+HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config
 
 HOST_ASTERISK_CONF_OPTS = \
 	--without-newt \
Signature · 1 line
2.16.1
#1 lore raw

PATCH 1/1 asterisk: replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Commit 0f9c0bf3d5cd did a global replace of $(HOST_DIR)/usr/bin to $(HOST_DIR)/bin. But later, a new occurrence of $(HOST_DIR)/usr/bin snuck into the sources via commit 05e306d8d33 which added asterisk.

---
 package/asterisk/asterisk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/asterisk/asterisk.mk +0 -0
index f14c008111..28b85da562 100644

package/asterisk/asterisk.mk HOST_ASTERISK_LICENSE_FILES = COPYING · line 290

Quoted 5 lines
package/asterisk/asterisk.mk +1 -1
@@ -287,7 +287,7 @@ HOST_ASTERISK_LICENSE_FILES = COPYING
 # so do not inherit the target setup.
 HOST_ASTERISK_AUTORECONF = NO
 
-HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/usr/bin/xml2-config
+HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config

It shouldn't really matter because of the usr symlink, but it cannot hurt either - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard