diff options
| -rw-r--r-- | packages/mozilla/fennec/mozconfig | 22 | ||||
| -rw-r--r-- | packages/mozilla/fennec_hg.bb | 31 |
2 files changed, 20 insertions, 33 deletions
diff --git a/packages/mozilla/fennec/mozconfig b/packages/mozilla/fennec/mozconfig index f4b2c5aa95..ba4099d691 100644 --- a/packages/mozilla/fennec/mozconfig +++ b/packages/mozilla/fennec/mozconfig @@ -1,25 +1,9 @@ -# Options for client.mk. mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mobilebase - -# Global options -#ac_add_options --enable-debug -#ac_add_options --disable-optimize -#ac_add_options --enable-logging -#ac_cv_visibility_pragma=no +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir +mk_add_options AUTOCONF=autoconf2.13 -#ac_add_options --enable-timeline +ac_add_options --disable-javaxpcom -# XULRunner options ac_add_app_options xulrunner --enable-application=xulrunner -ac_add_app_options xulrunner --disable-javaxpcom -# mobile options ac_add_app_options mobile --enable-application=mobile -ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist - -# configure will be automatically generated using the 'autoconf-2.13' -# command. If autoconf-2.13 isn't the right name for your system, as -# is the case on OS X using MacPorts, use the real command name as -# demonstrated below. -mk_add_options AUTOCONF=autoconf2.13 diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index b71cf9b8b3..b3542ce928 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -1,6 +1,6 @@ DEPENDS += "cairo" -PV = "0.0" +PV = "0.7" PR = "r1" SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \ @@ -32,20 +32,23 @@ do_compile_prepend() { -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ ${S}/security/coreconf/Linux.mk - sed -i -e /LIBXUL_DIST/d ${S}/objdir/mobile/config/autoconf.mk - echo "LIBXUL_DIST=${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk + sed -i -e /LIBXUL_DIST/d \ + -e /LIBXUL_SDK/d \ + ${S}/objdir/mobile/config/autoconf.mk + + echo "LIBXUL_DIST = ${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk + echo "LIBXUL_SDK = ${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk } -do_stage() { - install -d ${STAGING_INCDIR}/fennec-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/fennec-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/fennec-${PV}/nsIServiceManager.h + +do_install() { + cd ${S}/objdir/mobile/ + oe_runmake package + install -d ${D}/${libdir} + tar xjf ${S}/objdir/mobile/dist/fennec-${PV}*.tar.bz2 -C ${D}/${libdir} + # remove x86 binary + rm ${D}/${libdir}/fennec/xulrunner/nsinstall } +FILES_${PN} += "${libdir}/fennec" + |