[oe-commits] org.oe.dev firefox all use autotools_do_stage to populate staging

[mickeyl commit]

firefox all use autotools_do_stage to populate staging
this is needed to compile plugins against firefox. closes #1612

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f8d54cc4c0dfc594e55d38708db17f5d5c68846a
ViewMTN: http://monotone.openembedded.org/revision/info/f8d54cc4c0dfc594e55d38708db17f5d5c68846a
Files:
1
packages/mozilla/firefox.inc
packages/mozilla/firefox_1.0.7.bb
packages/mozilla/firefox_2.0.0.3.bb
Diffs:

#
# mt diff -r85695f46e180fb183f936f533d191d17a1bfd505 -rf8d54cc4c0dfc594e55d38708db17f5d5c68846a
#
# 
# 
# patch "packages/mozilla/firefox.inc"
#  from [ce3d32af7c35197aad91f186be895b364ae58f9b]
#    to [2b8653e70c8128f0b821b235f2f0e1fbcc2c8779]
# 
# patch "packages/mozilla/firefox_1.0.7.bb"
#  from [a8138fce8dfb4fd4ec448e058aecd870575ede96]
#    to [f02c0cc9b745dd1b59e3c6948bcb6049880a2178]
# 
# patch "packages/mozilla/firefox_2.0.0.3.bb"
#  from [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
#    to [9f6ce8af3b3e82e5889f640c7552aed39d0fd930]
# 
============================================================
--- packages/mozilla/firefox.inc	ce3d32af7c35197aad91f186be895b364ae58f9b
+++ packages/mozilla/firefox.inc	2b8653e70c8128f0b821b235f2f0e1fbcc2c8779
@@ -1,4 +1,5 @@ SRC_URI += "file://mozilla-firefox.png f
 SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+
 PACKAGES =+ "firefox-inspector"
 
 FILES_firefox-inspector = "	${libdir}/firefox-${PV}/chrome/inspector* \
@@ -27,3 +28,11 @@ pkg_postinst_firefox() {
 	# work around requirement for root access on first startup
 	chmod -R a+w ${libdir}/firefox*
 }
+
+do_stage() {
+	autotools_stage_all
+
+
+
+}
+
============================================================
--- packages/mozilla/firefox_1.0.7.bb	a8138fce8dfb4fd4ec448e058aecd870575ede96
+++ packages/mozilla/firefox_1.0.7.bb	f02c0cc9b745dd1b59e3c6948bcb6049880a2178
@@ -1,4 +1,5 @@
-PR = "r0"
+PR = "r2"
+
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
@@ -8,11 +9,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
 	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
 	file://xptcinvoke-arm.patch;patch=1 \
 	file://mozilla-eabi.patch;patch=1"
-
 S = "${WORKDIR}/mozilla"
 
-inherit mozilla
-
+inherit autotools mozilla
+	
 require firefox.inc
 
 EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
@@ -20,4 +20,3 @@ do_compile_prepend() {
 do_compile_prepend() {
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
 }
-
============================================================
--- packages/mozilla/firefox_2.0.0.3.bb	0ee74a5aef3cee4364cdc98fcb62c10891e384a5
+++ packages/mozilla/firefox_2.0.0.3.bb	9f6ce8af3b3e82e5889f640c7552aed39d0fd930
@@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
 	file://no-xmb.patch;patch=1 \
 	file://jsautocfg.h \
 	file://extensions-hack.patch;patch=1 \
-        file://security-cross.patch;patch=1 \
-        file://jsautocfg-dontoverwrite.patch;patch=1 \
-        file://xptcinvoke-arm.patch;patch=1 \
-        file://eabi-fix.patch;patch=1 \
-        file://eabi-fix2.patch;patch=1 \
-        file://eabi-fix3.patch;patch=1 \
-        file://linkage-problem.patch;patch=1 \
-       "
+	file://security-cross.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://xptcinvoke-arm.patch;patch=1 \
+	file://eabi-fix.patch;patch=1 \
+	file://eabi-fix2.patch;patch=1 \
+	file://eabi-fix3.patch;patch=1 \
+	file://linkage-problem.patch;patch=1 \
+"
 
 S = "${WORKDIR}/mozilla"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit mozilla
-
 require firefox.inc
 
 do_compile_prepend() {
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-
 	sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
 }
 
 do_stage() {
-
-        install -d ${STAGING_INCDIR}/${P}
+        install -d ${STAGING_INCDIR}/firefox-${PV}
         cd dist/sdk/include
+		rm -rf obsolete
         headers=`find . -name "*.h"`
         for f in $headers
         do
-                install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f
+                install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/
         done
         # removes 2 lines that call absent headers
-        sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
+        sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h
 }