[oe-commits] org.oe.dev enca, motion, iperf, gdk-pixbuf, gtk+-directfb, python-sword: Use staging prefix/exec_prefix

[rpurdie commit]

enca, motion, iperf, gdk-pixbuf, gtk+-directfb, python-sword: Use staging prefix/exec_prefix

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 33c9650c4cd491ff13af2fa0adc9db8c46fe387b
ViewMTN: http://monotone.openembedded.org/revision/info/33c9650c4cd491ff13af2fa0adc9db8c46fe387b
Files:
1
packages/enca/enca_1.9.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/gtk+/gtk+-directfb_2.10.14.bb
packages/iperf/iperf_2.0.2.bb
packages/motion/motion_3.2.9.bb
packages/python/python-sword_1.5.10.bb
Diffs:

#
# mt diff -rc6edddd95b25091b099e415dc53632d69eb0669e -r33c9650c4cd491ff13af2fa0adc9db8c46fe387b
#
# 
# 
# patch "packages/enca/enca_1.9.bb"
#  from [3f45d7d5c08af642979d6f00e1d4be738432916d]
#    to [170a34fe65ffa5b756fb8a3ab945554409d7a1cd]
# 
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
#  from [3f4ef78e369b41a0f8ccf8a4fe57f2e72ec08eac]
#    to [ebc41824dadf597017213572755b0ea3d91f3acf]
# 
# patch "packages/gtk+/gtk+-directfb_2.10.14.bb"
#  from [adc3811f8a8a931557ef718a1d4b7cd23c8c11b6]
#    to [9203ff8df91c8dd6af8c33efab6b8db7a66b8e57]
# 
# patch "packages/iperf/iperf_2.0.2.bb"
#  from [b6633a4674fceed57eca90e36124712ee4b61f3b]
#    to [734e01b1f57953ae5be6c6e3d03456b3e11ff055]
# 
# patch "packages/motion/motion_3.2.9.bb"
#  from [a4694608f643db6102bb78cb3e161b72f0e5a5f5]
#    to [6ee124c5a1433238d4ff9e8f20ca72f7cb218fe0]
# 
# patch "packages/python/python-sword_1.5.10.bb"
#  from [73eb9b115d9b21296ba5df9e59506f3079400369]
#    to [27131c1232e8e3161793c5807f692e05fd813591]
# 
============================================================
--- packages/enca/enca_1.9.bb	3f45d7d5c08af642979d6f00e1d4be738432916d
+++ packages/enca/enca_1.9.bb	170a34fe65ffa5b756fb8a3ab945554409d7a1cd
@@ -13,7 +13,7 @@ inherit autotools
 
 inherit autotools
 
-EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}"
+EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 do_configure_append() {
 	sed -i s:-I/usr/include::g Makefile
============================================================
--- packages/gtk+/gdk-pixbuf_2.10.14.bb	3f4ef78e369b41a0f8ccf8a4fe57f2e72ec08eac
+++ packages/gtk+/gdk-pixbuf_2.10.14.bb	ebc41824dadf597017213572755b0ea3d91f3acf
@@ -73,7 +73,7 @@ do_stage() {
 
 do_stage() {
 	oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-	cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr
+	cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix}
 	autotools_stage_includes
 #	install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include
 #	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
============================================================
--- packages/gtk+/gtk+-directfb_2.10.14.bb	adc3811f8a8a931557ef718a1d4b7cd23c8c11b6
+++ packages/gtk+/gtk+-directfb_2.10.14.bb	9203ff8df91c8dd6af8c33efab6b8db7a66b8e57
@@ -44,7 +44,7 @@ EXTRA_OECONF =" \
 #	   file://gtk-doc.patch;patch=1 \
 "
 EXTRA_OECONF =" \
-                --prefix=${STAGING_DIR} \
+                --prefix=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-gdktarget=directfb \
                 --without-x \
                 --without-libtiff \
============================================================
--- packages/iperf/iperf_2.0.2.bb	b6633a4674fceed57eca90e36124712ee4b61f3b
+++ packages/iperf/iperf_2.0.2.bb	734e01b1f57953ae5be6c6e3d03456b3e11ff055
@@ -14,7 +14,7 @@ do_configure() {
 # --disable-threads is needed on epia/x86 with uclibc
 do_configure() {
 	gnu-configize
-	oe_runconf --exec-prefix=${STAGING_DIR}  --disable-threads
+	oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}  --disable-threads
 }
 
 do_compile() {
============================================================
--- packages/motion/motion_3.2.9.bb	a4694608f643db6102bb78cb3e161b72f0e5a5f5
+++ packages/motion/motion_3.2.9.bb	6ee124c5a1433238d4ff9e8f20ca72f7cb218fe0
@@ -16,4 +16,4 @@ EXTRA_OECONF = " --with-ffmpeg=${STAGING
 EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \
                  --with-mysql-lib=${STAGING_LIBDIR} \
                  --with-mysql-include=${STAGING_INCDIR}/mysql \
+                 --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} "
-                 --with-pgsql=${STAGING_DIR} "
============================================================
--- packages/python/python-sword_1.5.10.bb	73eb9b115d9b21296ba5df9e59506f3079400369
+++ packages/python/python-sword_1.5.10.bb	27131c1232e8e3161793c5807f692e05fd813591
@@ -11,7 +11,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}/binding
 
 S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
 
-EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 inherit distutils autotools