diff options
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 10 | ||||
| -rw-r--r-- | package/firefox/patches/patch-configure | 4 | ||||
| -rw-r--r-- | package/firefox/patches/patch-security_coreconf_Linux_mk | 15 | ||||
| -rw-r--r-- | package/firefox/patches/patch-security_coreconf_command_mk | 11 |
4 files changed, 35 insertions, 5 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b5d034065..895a2c76a 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -35,9 +35,12 @@ else CONFIGURE_ARGS+= --enable-ipc endif -CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ - HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ - HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \ +CONFIGURE_ENV+= CROSS_COMPILE=1 \ + HOST_CC="${CC_FOR_BUILD}" \ + HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \ + HOST_CXX="${CXX_FOR_BUILD}" \ + HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ + BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \ PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ @@ -67,6 +70,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-crashreporter XAKE_FLAGS+= OS_RELEASE="2.6" +XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" post-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 4a3499a7b..6ab49e7f0 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -42,8 +42,8 @@ - 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` ++HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags` ++HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs` + +echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}" +echo "host libidl libs: ${HOST_LIBIDL_LIBS}" diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk new file mode 100644 index 000000000..26a3dc8f3 --- /dev/null +++ b/package/firefox/patches/patch-security_coreconf_Linux_mk @@ -0,0 +1,15 @@ +--- mozilla-1.9.2.orig/security/coreconf/Linux.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/Linux.mk 2011-01-20 20:18:26.904905227 +0100 +@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + +-CC = gcc +-CCC = g++ +-RANLIB = ranlib ++CC ?= gcc ++CCC ?= g++ ++RANLIB ?= ranlib + + DEFAULT_COMPILER = gcc + diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk new file mode 100644 index 000000000..fcf73b8a8 --- /dev/null +++ b/package/firefox/patches/patch-security_coreconf_command_mk @@ -0,0 +1,11 @@ +--- mozilla-1.9.2.orig/security/coreconf/command.mk 2010-12-03 16:48:49.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/command.mk 2011-01-20 20:18:56.214904993 +0100 +@@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L + CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ + $(XCFLAGS) + PERL = perl +-RANLIB = echo ++RANLIB = ranlib + TAR = /bin/tar + # + # For purify |