diff options
Diffstat (limited to 'meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch')
| -rw-r--r-- | meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch | 149 |
1 files changed, 0 insertions, 149 deletions
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch deleted file mode 100644 index 5952ac69..00000000 --- a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch +++ /dev/null @@ -1,149 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Sat, 19 Apr 2008 23:01:20 +0200 -Subject: Check less things during configure when using libxul-sdk - -We don't need to check e.g. cairo or pango when using libxul-sdk, since -we won't be building most of the toolkit. ---- - configure.in | 30 +++++++++++++++++++++++++----- - 1 file changed, 25 insertions(+), 5 deletions(-) - -diff --git a/configure.in b/configure.in -index 6b155e0..18872c4 100644 ---- a/configure.in -+++ b/configure.in -@@ -4190,6 +4190,7 @@ AC_SUBST(LIBXUL_SDK) - - if test -n "$LIBXUL_SDK"; then - LIBXUL_DIST="$LIBXUL_SDK" -+ SKIP_LIBRARY_CHECKS=1 - else - LIBXUL_DIST="$MOZ_BUILD_ROOT/dist" - fi -@@ -4224,6 +4225,10 @@ if test -n "$MOZ_NATIVE_NSPR"; then - AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it])) - CFLAGS=$_SAVE_CFLAGS - else -+ if test -n "$LIBXUL_SDK"; then -+ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" -+ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" -+ else - if test "$OS_ARCH" = "WINNT"; then - NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr" - if test -n "$GNU_CC"; then -@@ -4235,6 +4240,7 @@ else - NSPR_CFLAGS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`' - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi -+ fi - fi - - dnl system libevent Support -@@ -4935,6 +4941,7 @@ dnl ======================================================== - dnl = startup-notification support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_ENABLE_GTK2" - then - MOZ_ENABLE_STARTUP_NOTIFICATION= -@@ -4963,6 +4970,7 @@ then - - TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" - fi -+fi - AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) -@@ -5060,6 +5068,12 @@ AC_SUBST(MOZ_QT_LIBS) - AC_SUBST(MOC) - - AC_SUBST(MOZ_DFB) -+ -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" -+then -+ AC_DEFINE(MOZ_X11) -+ MOZ_X11=1 -+fi - AC_SUBST(MOZ_X11) - - dnl ======================================================== -@@ -5145,7 +5159,7 @@ MOZ_ARG_DISABLE_BOOL(pango, - dnl ======================================================== - dnl = Pango - dnl ======================================================== --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - AC_SUBST(MOZ_PANGO) - -@@ -5186,6 +5200,7 @@ dnl ======================================================== - dnl = GnomeVFS, GIO and GConf support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11" - then - dnl build the gnomevfs extension by default only when the -@@ -5424,6 +5439,9 @@ AC_SUBST(MOZ_DBUS_LIBS) - AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) - AC_SUBST(MOZ_DBUS_GLIB_LIBS) - -+fi # LIBXUL_SDK -+ -+ - dnl ======================================================== - dnl = Build Personal Security Manager - dnl ======================================================== -@@ -5796,6 +5814,7 @@ dnl = Check alsa availability on Linux if using sydneyaudio - dnl ======================================================== - - dnl If using sydneyaudio with Linux, ensure that the alsa library is available -+if test -z "$LIBXUL_SDK"; then - if test -n "$MOZ_SYDNEYAUDIO"; then - case "$target_os" in - linux*) -@@ -5805,6 +5824,7 @@ linux*) - ;; - esac - fi -+fi - - dnl ======================================================== - dnl Permissions System -@@ -7045,7 +7065,7 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - --if test "$NS_TRACE_MALLOC"; then -+if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then - MOZ_MEMORY= - fi - -@@ -7920,7 +7940,7 @@ MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) - dnl Check for GLib. - dnl ======================================================== - --if test -z "$SKIP_PATH_CHECKS"; then -+if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then - if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) -@@ -8610,7 +8630,7 @@ else - fi - - dnl Check for missing components --if test "$COMPILE_ENVIRONMENT"; then -+if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11"; then - dnl ==================================================== - dnl = Check if X headers exist -@@ -8649,7 +8669,7 @@ if test -n "$MOZ_WEBGL_GLX"; then - fi # MOZ_WEBGL_GLX - fi # COMPILE_ENVIRONMENT - --if test "$USE_FC_FREETYPE"; then -+if test "$USE_FC_FREETYPE" && test -z "$LIBXUL_SDK"; then - if test "$COMPILE_ENVIRONMENT"; then - _SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" |