org.handhelds.familiar/packages/mozilla/minimo/host_ldflags_fix.patch

   1 --- mozilla/nsprpub/config/rules.mk.old
   2 +++ mozilla/nsprpub/config/rules.mk
   3 @@ -87,6 +87,9 @@
   4  CCC=$(HOST_CXX)
   5  CFLAGS=$(HOST_CFLAGS)
   6  CXXFLAGS=$(HOST_CXXFLAGS)
   7 +LDFLAGS=$(HOST_LDFLAGS)
   8 +RANLIB=$(HOST_RANLIB)
   9 +AR=$(HOST_AR)
  10  endif
  11  endif
  12  endif
  13 --- mozilla/configure.in.old
  14 +++ mozilla/configure.in
  15 @@ -6098,12 +6098,17 @@
  16
  17  if test -n "$CROSS_COMPILE"; then
  18       if test -z "$HOST_LIBIDL_CONFIG"; then
  19 +        AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
  20          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
  21      fi
  22      if test -n "$HOST_LIBIDL_CONFIG"; then
  23 +        AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
  24          HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
  25 +        AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
  26          HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
  27 +        AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
  28      else
  29 +        AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
  30          HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
  31          HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
  32      fi
  33 --- mozilla/configure.old
  34 +++ mozilla/configure
  35 @@ -17604,11 +17604,18 @@
  36
  37  if test -n "$CROSS_COMPILE"; then
  38       if test -z "$HOST_LIBIDL_CONFIG"; then
  39 +        echo "HOST_LIBIDL_CONFIG nto defined"
  40          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
  41      fi
  42 -    if test -n "$HOST_LIBIDL_CONFIG"; then
  43 +    if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then
  44 +        echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
  45 +        _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
  46 +       PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
  47          HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
  48 +        echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
  49          HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
  50 +        echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
  51 +       PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
  52      else
  53          HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
  54          HOST_LIBIDL_LIBS="$LIBIDL_LIBS"