firefox all use autotools_do_stage to populate staging

this is needed to compile plugins against firefox. closes #1612

diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index bd03223..f5e020d 100644 (file)
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,4 +1,5 @@
 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
+
+
+
+}
+

diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb
index dd4d734..b82dbda 100644 (file)
--- a/packages/mozilla/firefox_1.0.7.bb
+++ b/packages/mozilla/firefox_1.0.7.bb
@@ -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/mozilla.org/firefox/releases/${PV}/source/
        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 @@ EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
 do_compile_prepend() {
        cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
 }
-

diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb
index e1fb5a9..72c42bc 100644 (file)
--- a/packages/mozilla/firefox_2.0.0.3.bb
+++ b/packages/mozilla/firefox_2.0.0.3.bb
@@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/
        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
 }