diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
| commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
| tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/firefox | |
| parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
| parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 9 | ||||
| -rw-r--r-- | package/firefox/patches/patch-configure | 28 |
2 files changed, 31 insertions, 6 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b5a195c6f..0e1c6fe9f 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ -PKG_TARGET_DEPENDS:= alix x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 @@ -38,8 +38,9 @@ endif CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \ + PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ - CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \ + CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ ac_cv_thread_keyword=no \ ac_cv_sizeof_int_p=4 @@ -51,8 +52,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-nss \ --with-system-nspr \ --enable-system-sqlite \ - --with-libIDL-prefix=${STAGING_DIR}/usr \ - --with-glib-prefix=${STAGING_DIR}/usr \ + --with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \ + --with-glib-prefix=${STAGING_TARGET_DIR}/usr \ --enable-libxul \ --disable-tests \ --disable-libconic \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index a5f6df0b9..4a3499a7b 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,5 @@ ---- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-12-12 12:03:54.000000000 +0100 +--- mozilla-1.9.2.orig/configure 2010-12-03 16:57:11.000000000 +0100 ++++ mozilla-1.9.2/configure 2010-12-29 21:52:34.000000000 +0100 @@ -3970,7 +3970,7 @@ else echo "$ac_t""yes" 1>&6 fi @@ -26,3 +26,27 @@ else cat > conftest.$ac_ext <<EOF +@@ -21460,18 +21459,11 @@ fi + fi + fi + +-if test -n "$CROSS_COMPILE"; then +- if test -z "$HOST_LIBIDL_CONFIG"; then +- HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" +- fi +- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then +- HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` +- HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` +- else +- HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" +- HOST_LIBIDL_LIBS="$LIBIDL_LIBS" +- fi +-fi ++HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --cflags` ++HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --libs` ++ ++echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}" ++echo "host libidl libs: ${HOST_LIBIDL_LIBS}" + + if test -z "$SKIP_PATH_CHECKS"; then + if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then |