From fdbb2e437bdecdf067bd1dcb0abe88ef5610e603 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 20:40:14 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 15:37:11-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/20 15:34:00-05:00 handhelds.org!kergoth
minimo, firefox, thunderbird: consolodate metadata into a firefox.inc and mozilla.bbclass, adapt .bb's to use it, fix aspects of the build that break when building for uclibc, and fix the build when using make -j.

BKrev: 41f0172eeiVUflxzEV1JFbaaLOcx1w
---
 packages/mozilla/firefox_0.9.3.bb | 47 +++------------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

(limited to 'packages/mozilla/firefox_0.9.3.bb')

diff --git a/packages/mozilla/firefox_0.9.3.bb b/packages/mozilla/firefox_0.9.3.bb
index 74e624f323..7cf33da9e9 100644
--- a/packages/mozilla/firefox_0.9.3.bb
+++ b/packages/mozilla/firefox_0.9.3.bb
@@ -1,52 +1,11 @@
-SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2"
 PR = "r2"
-LICENSE = "MPL NPL"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2 \
-	file://mozconfig \
+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 \
 	file://extensions-hack.patch;patch=1 \
 	file://mozilla-firefox.png file://mozilla-firefox.desktop"
-
 S = "${WORKDIR}/mozilla"
 
-PACKAGES =+ "firefox-inspector"
-
-FILES_firefox-inspector = "${libdir}/firefox-${PV}/chrome/inspector"
-FILES_${PN} = "${bindir}/firefox ${datadir}/applications ${datadir}/pixmaps ${libdir}/firefox-${PV}"
-FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config"
-
-SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing"
-
-export CROSS_COMPILE=1
-export HOST_LIBIDL_CONFIG="libIDL-config-2"
-export CONFIGURE_ARGS="--target=${TARGET_SYS} --host=${BUILD_SYS} --build=${BUILD_SYS} --prefix=${prefix}"
-
-export HOST_CFLAGS="${BUILD_CFLAGS}"
-export HOST_CXXFLAGS="${BULID_CXXFLAGS}"
-export HOST_LDFLAGS="${BUILD_LDFLAGS}"
-export HOST_RANLIB="${BUILD_RANLIB}"
-export HOST_AR="${BUILD_AR}"
-
-do_configure() {
-	cp ${WORKDIR}/mozconfig .mozconfig
-}
-
-do_compile() {
-	make -f client.mk build_all
-}
-
-do_install() {
-	make DESTDIR="${D}" install
-	install -d ${D}${datadir}/applications
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/mozilla-firefox.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/mozilla-firefox.png ${D}${datadir}/pixmaps/
-	rm -f ${D}${libdir}/firefox-${PV}/TestGtkEmbed
-}
+inherit mozilla
 
-pkg_postinst_firefox() {
-	# work around requirement for root access on first startup
-	chmod -R a+w ${libdir}/firefox*
-}
+include firefox.inc
-- 
cgit v1.2.3