[oe-commits] org.oe.dev rdesktop, elf2flt, primstumbler, xmms-embedded: Remove hardcoded staging references

[rpurdie commit]

rdesktop, elf2flt, primstumbler, xmms-embedded: Remove hardcoded staging references

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 501c67dde049332cb9a85285814cba121334c407
ViewMTN: http://monotone.openembedded.org/revision/info/501c67dde049332cb9a85285814cba121334c407
Files:
1
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/rdesktop/rdesktop_1.3.1.bb
packages/rdesktop/rdesktop_1.4.1.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/uclibc/elf2flt_svn.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
Diffs:

#
# mt diff -rebc7a8c81fa299830e32cebc2b20fd8cf3233a6d -r501c67dde049332cb9a85285814cba121334c407
#
# 
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
#  from [2853cbcd850a08bb25348843fd824ec14dda114e]
#    to [be915c43601a85e473bfe81da31c8f2179696358]
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
#  from [7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896]
#    to [5e07eff37ac1acddc5f9e7b7094acc7b186aa792]
# 
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
#  from [123c0963c930eec872198d019f1cf1e48eecccf0]
#    to [546d9776aaef7f0a511f8a28671dc0a592278cdb]
# 
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
#  from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
#    to [cef9fbbda34cd8ffc2e16eb427b9930989d5121b]
# 
# patch "packages/rdesktop/rdesktop_1.5.0.bb"
#  from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
#    to [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
# 
# patch "packages/uclibc/elf2flt_svn.bb"
#  from [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
#    to [5e4764fa17f04ac0f68f4e90559919814f21f2e0]
# 
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
#  from [03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e]
#    to [fa97c83984b56db433bad80d69a6a49429af862a]
# 
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb	2853cbcd850a08bb25348843fd824ec14dda114e
+++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb	be915c43601a85e473bfe81da31c8f2179696358
@@ -20,12 +20,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--x-libraries=${STAGING_LIBDIR} \
-		--with-libgps=${STAGING_DIR}/${HOST_SYS} \
-		--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+		--with-libgps=${STAGING_EXECPREFIXDIR} \
+		--with-libpcap=${STAGING_EXECPREFIXDIR} \
 		--with-sqlite-includes=${STAGING_INCDIR} \
 		--with-sqlite-libs=${STAGING_LIBDIR} \
 		--without-athena --enable-dbus \
-                --with-libiw=${STAGING_DIR}/${HOST_SYS}"
+                --with-libiw=${STAGING_EXECPREFIXDIR}"
 
 CFLAGS =+ "-I${S}/include"
 LDFLAGS += "-lz"
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3.bb	7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896
+++ packages/prismstumbler/prismstumbler_0.7.3.bb	5e07eff37ac1acddc5f9e7b7094acc7b186aa792
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--x-libraries=${STAGING_LIBDIR} \
-		--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+		--with-libpcap=${STAGING_EXECPREFIXDIR} \
 		--with-sqlite-includes=${STAGING_INCDIR} \
 		--with-sqlite-libs=${STAGING_LIBDIR} \
 		--without-athena \
============================================================
--- packages/rdesktop/rdesktop_1.3.1.bb	123c0963c930eec872198d019f1cf1e48eecccf0
+++ packages/rdesktop/rdesktop_1.3.1.bb	546d9776aaef7f0a511f8a28671dc0a592278cdb
@@ -22,8 +22,8 @@ do_configure() {
 	--bindir=${bindir} \
 	--mandir=${mandir} \
 	--sharedir=${datadir} \
-	--with-x=${STAGING_DIR}/${HOST_SYS} \
-	--with-openssl=${STAGING_DIR}/${HOST_SYS} \
+	--with-x=${STAGING_EXECPREFIXDIR} \
+	--with-openssl=${STAGING_EXECPREFIXDIR} \
 	--with-oss \
 	--without-debug
 }
============================================================
--- packages/rdesktop/rdesktop_1.4.1.bb	a9ab28ff03d914badd10a000f082d6b5351d7abc
+++ packages/rdesktop/rdesktop_1.4.1.bb	cef9fbbda34cd8ffc2e16eb427b9930989d5121b
@@ -11,4 +11,4 @@ inherit autotools
 
 inherit autotools
 
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
============================================================
--- packages/rdesktop/rdesktop_1.5.0.bb	8168a10aad2470f1e81cde1b8e148b7691e31cb3
+++ packages/rdesktop/rdesktop_1.5.0.bb	9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd
@@ -10,4 +10,4 @@ inherit autotools
 
 inherit autotools
 
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
============================================================
--- packages/uclibc/elf2flt_svn.bb	376f3f2ab831cad1d7e4af6fdbc4d054ce873500
+++ packages/uclibc/elf2flt_svn.bb	5e4764fa17f04ac0f68f4e90559919814f21f2e0
@@ -9,7 +9,7 @@ S = "${WORKDIR}/${PN}"
 
 S = "${WORKDIR}/${PN}"
 
-EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \
-                 --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \
-                 --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \
+EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \
+                 --with-libiberty=${STAGING_LIBDIR}/libiberty.a \
+                 --with-bfd-include-dir=${STAGING_INCDIR} \
                "
============================================================
--- packages/xmms-embedded/xmms-embedded_20040327.bb	03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e
+++ packages/xmms-embedded/xmms-embedded_20040327.bb	fa97c83984b56db433bad80d69a6a49429af862a
@@ -31,7 +31,7 @@ do_compile() {
 }
 
 do_compile() {
-	oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}"
+	oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}"
 }
 
 do_install() {