[oe-commits] org.oe.dev asterisk: Remove hardcoded staging references

[rpurdie commit]

asterisk: Remove hardcoded staging references

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 0eacc8eaf57f3bac938e07937e3f072b6a61699f
ViewMTN: http://monotone.openembedded.org/revision/info/0eacc8eaf57f3bac938e07937e3f072b6a61699f
Files:
1
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.4.17.bb
Diffs:

#
# mt diff -rba4728792a4451669f79f5fd4479bf81b4682df8 -r0eacc8eaf57f3bac938e07937e3f072b6a61699f
#
# 
# 
# patch "packages/asterisk/asterisk_1.4.10.bb"
#  from [2d51154605b0ca7b662304502f3cb12e7330014e]
#    to [63f58515cb08e7fedd04b521e8d2b6ba74a63457]
# 
# patch "packages/asterisk/asterisk_1.4.11.bb"
#  from [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
#    to [60ad063e816162c04cc9f9093a4b97c9e48fb6be]
# 
# patch "packages/asterisk/asterisk_1.4.17.bb"
#  from [060df18e986c1290e557ca7de184d66634bcb25a]
#    to [2f04528dd5495d5de7fee0972edafd159d0453b6]
# 
============================================================
--- packages/asterisk/asterisk_1.4.10.bb	2d51154605b0ca7b662304502f3cb12e7330014e
+++ packages/asterisk/asterisk_1.4.10.bb	63f58515cb08e7fedd04b521e8d2b6ba74a63457
@@ -30,17 +30,17 @@ inherit autotools update-rc.d
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.11.bb	c8d00d57639bbb867b0f3bab8775bb2375e7fd7a
+++ packages/asterisk/asterisk_1.4.11.bb	60ad063e816162c04cc9f9093a4b97c9e48fb6be
@@ -32,17 +32,17 @@ inherit autotools update-rc.d
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR}\
+			--with-z=${STAGING_EXECPREFIXDIR}\
+			--with-curl=${STAGING_EXECPREFIXDIR}\
+			--with-termcap=${STAGING_EXECPREFIXDIR}\
+			--with-ogg=${STAGING_EXECPREFIXDIR}\
+			--with-vorbis=${STAGING_EXECPREFIXDIR}\
+			--with-sqlite=${STAGING_EXECPREFIXDIR}\
+			--with-popt=${STAGING_EXECPREFIXDIR}\
+			--with-gnutls=${STAGING_EXECPREFIXDIR}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.17.bb	060df18e986c1290e557ca7de184d66634bcb25a
+++ packages/asterisk/asterisk_1.4.17.bb	2f04528dd5495d5de7fee0972edafd159d0453b6
@@ -31,17 +31,17 @@ inherit autotools update-rc.d
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\