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

11 files changed, 41 insertions, 260 deletions

diff --git a/packages/mozilla/firefox-0.10.1/extensions-hack.patch b/classes/mozilla.bbclass
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-0.10.1/extensions-hack.patch
+++ b/classes/mozilla.bbclass
diff --git a/packages/mozilla/firefox-1.0/extensions-hack.patch b/packages/mozilla/firefox-1.0/extensions-hack.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.0/extensions-hack.patch
+++ /dev/null
diff --git a/packages/mozilla/firefox-0.9.2/extensions-hack.patch b/packages/mozilla/firefox.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-0.9.2/extensions-hack.patch
+++ b/packages/mozilla/firefox.inc
diff --git a/packages/mozilla/firefox-0.9.3/extensions-hack.patch b/packages/mozilla/firefox/extensions-hack.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-0.9.3/extensions-hack.patch
+++ b/packages/mozilla/firefox/extensions-hack.patch
diff --git a/packages/mozilla/firefox_0.10.1.bb b/packages/mozilla/firefox_0.10.1.bb
index 1ba7050f9f..9df9cc0e34 100644
--- a/packages/mozilla/firefox_0.10.1.bb
+++ b/packages/mozilla/firefox_0.10.1.bb
@@ -1,52 +1,11 @@
-SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2"
 PR = "r0"
-LICENSE = "MPL NPL"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-1.0PR-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} ${bindir}/defaults"
-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}" 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
diff --git a/packages/mozilla/firefox_0.9.2.bb b/packages/mozilla/firefox_0.9.2.bb
index 49f3b493fc..5924068c93 100644
--- a/packages/mozilla/firefox_0.9.2.bb
+++ b/packages/mozilla/firefox_0.9.2.bb
@@ -1,47 +1,11 @@
-SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2"
 PR = "r10"
-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"
 
-FILES_${PN} += "${libdir}/firefox-${PV} ${datadir}/idl"
-
-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/
-	# work around requirement for root access on first startup
-}
+inherit mozilla
 
-pkg_postinst_firefox() {
-	chmod -R a+w ${libdir}/firefox*
-}
+include firefox.inc
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
diff --git a/packages/mozilla/firefox_0.9.bb b/packages/mozilla/firefox_0.9.bb
index 102d35e908..ec0d84a57a 100644
--- a/packages/mozilla/firefox_0.9.bb
+++ b/packages/mozilla/firefox_0.9.bb
@@ -1,40 +1,10 @@
-SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2"
 PR = "r3"
-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://no-xmb.patch;patch=1 \
+	file://mozilla-firefox.png file://mozilla-firefox.desktop"
 S = "${WORKDIR}/mozilla"
 
-FILES_${PN} += "${libdir}/firefox-${PV} ${datadir}/idl"
-
-# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
-CFLAGS := "${@'${CFLAGS}'.replace('-frename-registers', '')} -fsigned-char -fno-strict-aliasing"
-CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')} -fsigned-char -fno-strict-aliasing"
-
-SELECTED_OPTIMIZATION = "-Os"
-
-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
-}
+inherit mozilla
 
-do_install() {
-	make DESTDIR="${D}" install
-}
+include firefox.inc
diff --git a/packages/mozilla/firefox_1.0.bb b/packages/mozilla/firefox_1.0.bb
index e56631909a..f893d9756f 100644
--- a/packages/mozilla/firefox_1.0.bb
+++ b/packages/mozilla/firefox_1.0.bb
@@ -1,52 +1,10 @@
-SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2"
 PR = "r0"
-LICENSE ="MPL NPL"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://mozconfig \
 	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"
-
+	file://extensions-hack.patch;patch=1"
 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} ${bindir}/defaults"
-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}" 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
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 6f7f8ae637..baf1fa56bd 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "A minimal version of the Mozilla web browser"
-DEPENDS = "xt gtk+ libidl zip-native unzip-native"
 SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
            file://xptcstubs.patch;patch=1 \
 	   file://no-xmb.patch;patch=1 \
 	   file://host_ldflags_fix.patch;patch=1 \
-	   file://minimo.png file://minimo.desktop \
-           file://mozconfig"
+	   file://minimo.png file://minimo.desktop"
 S = "${WORKDIR}/mozilla"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
@@ -15,24 +13,13 @@ FILES_${PN} += "${libdir}/mozilla-minimo"
 PR = "r7"
 LICENSE = "MPL/LGPL/GPL"
 
+inherit mozilla
+
+EXTRA_OECONF += "--enable-application=suite"
+
 export MINIMO=1
-export CROSS_COMPILE=1
-export CONFIGURE_ARGS="--target=${TARGET_SYS} --host=${BUILD_SYS} --build=${BUILD_SYS}  --enable-application=suite"
-export CXX=${CC}
-export HOST_LIBIDL_CONFIG="${STAGING_BINDIR}/libIDL-config-2"
-export HOST_PKG_CONFIG_PATH="${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig"
 export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
-export MOZCONFIG="${WORKDIR}/mozconfig"
 export MOZ_CO_PROJECT="suite"
-export HOST_CC=${BUILD_CC}
-export HOST_CXX=${BUILD_CXX}
-export HOST_CFLAGS=${BUILD_CFLAGS}
-export HOST_CXXFLAGS=${BUILD_CXXFLAGS}
-export HOST_LDFLAGS=${BUILD_LDFLAGS}
-export HOST_RANLIB=${BUILD_RANLIB}
-export HOST_AR=${BUILD_AR}
-
-SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing"
 
 do_fetch () {
 	mkdir -p ${WORKDIR}
@@ -40,16 +27,16 @@ do_fetch () {
 	if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then
 		cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
 		cd mozilla
-		make -f client.mk checkout
+		oe_runmake -f client.mk checkout
 		cd ..
 		tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
 	fi
 }
 
 do_compile () {
-	make -f client.mk build_all
+	mozilla_do_compile
 	cd $MOZ_OBJDIR/embedding/minimo
-	make
+	oe_runmake
 }
 
 mozdir="${D}${libdir}/mozilla-minimo"
diff --git a/packages/mozilla/thunderbird_0.7.3.bb b/packages/mozilla/thunderbird_0.7.3.bb
index ab486c2d2f..8b83da248f 100644
--- a/packages/mozilla/thunderbird_0.7.3.bb
+++ b/packages/mozilla/thunderbird_0.7.3.bb
@@ -1,67 +1,51 @@
 SECTION = "x11/utils"
-DEPENDS = "xt libxi zip-native gtk+ orbit2 gnupg"
-RRECOMMENDS = "gnupg"
+DEPENDS += "gnupg"
+RRECOMMENDS += "gnupg"
 PR = "r1"
 
 EMVER="0.85.0"
 IPCVER="1.0.7"
-LICENSE = "MPL NPL"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-source.tar.bz2 \
 	http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz \
 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \
-	file://mozconfig \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://extensions-hack.patch;patch=1 \
 	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
-
 S = "${WORKDIR}/mozilla"
 
 FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl"
 
-SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing"
+inherit mozilla
 
 export MOZ_THUNDERBIRD=1
-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
 	for x in ipc enigmail; do
-		mv ${WORKDIR}/${x} ${WORKDIR}/mozilla/extensions
-		cd ${WORKDIR}/mozilla/extensions/${x}
-		makemake
+		if [ ! -e ${WORKDIR}/mozilla/extensions/$x ]; then
+			mv ${WORKDIR}/$x ${WORKDIR}/mozilla/extensions/
+			cd ${WORKDIR}/mozilla/extensions/$x
+			makemake
+		fi
 	done
-	cd ${WORKDIR}/mozilla
+	cd ${S}
+	mozilla_do_configure
 }
 
 do_compile() {
-	make -f client.mk build_all
-	cd ${WORKDIR}/mozilla/extensions/ipc
-	make
-	cd ${WORKDIR}/mozilla/extensions/enigmail
-	make
+	mozilla_do_compile
+	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc
+	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail
 }
 
 do_install() {
-	make DESTDIR="${D}" install
-	cd ${WORKDIR}/mozilla/extensions/ipc
-	make DESTDIR="${D}" install
-	cd ${WORKDIR}/mozilla/extensions/enigmail
-	make DESTDIR="${D}" install
-	cd ${WORKDIR}/mozilla
+	mozilla_do_install
+	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc DESTDIR="${D}" install
+	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail DESTDIR="${D}" install
 	install -d ${D}${datadir}/applications
 	install -d ${D}${datadir}/pixmaps
 	install -m 0644 ${WORKDIR}/mozilla-thunderbird.desktop ${D}${datadir}/applications/
 	install -m 0644 ${WORKDIR}/mozilla-thunderbird.png ${D}${datadir}/pixmaps/
-	# work around requirement for root access on first startup
 }
 
 pkg_postinst_thunderbird() {