diff options
| author | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
| commit | 34fc06736330cc993fd1c936ed9205cdc73aa0fd (patch) | |
| tree | 42319fe9aa25f82370948335d6dccd571da945d6 /package/firefox/patches/patch-configure | |
| parent | 6ea415c59b9ced9d08be7348d268ae4543017a56 (diff) | |
| parent | 297e4004d154572e29ee71f8ed852b022686e852 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox/patches/patch-configure')
| -rw-r--r-- | package/firefox/patches/patch-configure | 75 |
1 files changed, 34 insertions, 41 deletions
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 6ab49e7f0..733e4aa4c 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,52 +1,45 @@ ---- 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 - -- for ac_prog in $PYTHON python2.5 python2.4 python -+ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino - CYGWIN_WRAPPER= - WIN_TOP_SRC= - MOZ_USER_DIR=".mozilla" --HOST_AR='$(AR)' - HOST_AR_FLAGS='$(AR_FLAGS)' - - MOZ_JPEG_CFLAGS= -@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI - else - - if test "$cross_compiling" = yes; then -- ac_cv_sqlite_secure_delete=no -+ ac_cv_sqlite_secure_delete=yes - - else - cat > conftest.$ac_ext <<EOF -@@ -21460,18 +21459,11 @@ fi +--- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100 ++++ mozilla-2.0/configure 2011-04-07 18:48:49.000000000 +0200 +@@ -1588,7 +1588,7 @@ test -n "$HOST_CXX" || HOST_CXX="""" + HOST_CXXFLAGS="$CXXFLAGS" fi + if test -z "$HOST_LDFLAGS"; then +- HOST_LDFLAGS="$LDFLAGS" ++ HOST_LDFLAGS="$LDFLAGS_FOR_BUILD" + fi + if test -z "$HOST_AR_FLAGS"; then + HOST_AR_FLAGS="$AR_FLAGS" +@@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then fi --if test -n "$CROSS_COMPILE"; then -- if test -z "$HOST_LIBIDL_CONFIG"; then + +-if test -z "$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" +- if test -z "$HOST_LIBIDL_PREFIX"; then +- HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX" - fi -fi +- + if test "$SKIP_IDL_CHECK" = "no" + then + _LIBIDL_FOUND= +@@ -22788,6 +22779,7 @@ fi + fi + fi + ++ + # Check whether --with-glib-prefix or --without-glib-prefix was given. + if test "${with_glib_prefix+set}" = set; then + withval="$with_glib_prefix" +@@ -23542,6 +23534,9 @@ else + LIBIDL_LIBS="$HOST_LIBIDL_LIBS" + fi + +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}" - if test -z "$SKIP_PATH_CHECKS"; then - if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then + if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then + if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then |