diff options
| author | Mika Laitio <lamikr@cc.jyu.fi> | 2006-06-06 23:37:33 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-06 23:37:33 +0000 |
| commit | dbbc34545da367330bc04036bcc5b1d5a7dc9cef (patch) | |
| tree | 8a7f1faa30250d6b3088b79840eb3ff6dcedabb6 /packages/mozilla/minimo | |
| parent | e9f308acea1c1258a69d8368735390f3f234e82d (diff) | |
minimo: update the config patches to apply with cvs head.
Diffstat (limited to 'packages/mozilla/minimo')
| -rw-r--r-- | packages/mozilla/minimo/host_ldflags_fix.patch | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch index f4ff51fae1..de48d8eb8e 100644 --- a/packages/mozilla/minimo/host_ldflags_fix.patch +++ b/packages/mozilla/minimo/host_ldflags_fix.patch @@ -1,54 +1,56 @@ ---- mozilla/nsprpub/config/rules.mk.old -+++ mozilla/nsprpub/config/rules.mk -@@ -87,6 +87,9 @@ - CCC=$(HOST_CXX) - CFLAGS=$(HOST_CFLAGS) - CXXFLAGS=$(HOST_CXXFLAGS) -+LDFLAGS=$(HOST_LDFLAGS) -+RANLIB=$(HOST_RANLIB) -+AR=$(HOST_AR) - endif - endif - endif ---- mozilla/configure.in.old -+++ mozilla/configure.in -@@ -6098,12 +6098,17 @@ +diff -Naur mozilla_old/configure mozilla/configure +--- mozilla_old/configure 2006-06-03 23:44:17.000000000 +0300 ++++ mozilla/configure 2006-06-07 00:16:15.000000000 +0300 +@@ -18755,11 +18755,18 @@ if test -n "$CROSS_COMPILE"; then if test -z "$HOST_LIBIDL_CONFIG"; then -+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) ++ echo "HOST_LIBIDL_CONFIG not defined" HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi - if test -n "$HOST_LIBIDL_CONFIG"; then -+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) +- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then ++ if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no" && test -n "$HOST_PKG_CONFIG_PATH"; then ++ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" ++ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH ++ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` -+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) ++ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` -+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) ++ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" ++ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH else -+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" HOST_LIBIDL_LIBS="$LIBIDL_LIBS" - fi ---- mozilla/configure.old -+++ mozilla/configure -@@ -17604,11 +17604,18 @@ +diff -Naur mozilla_old/configure.in mozilla/configure.in +--- mozilla_old/configure.in 2006-06-03 23:35:20.000000000 +0300 ++++ mozilla/configure.in 2006-06-07 00:10:26.000000000 +0300 +@@ -6870,12 +6870,17 @@ if test -n "$CROSS_COMPILE"; then if test -z "$HOST_LIBIDL_CONFIG"; then -+ echo "HOST_LIBIDL_CONFIG nto defined" ++ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi -- if test -n "$HOST_LIBIDL_CONFIG"; then -+ if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then -+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" -+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH -+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH + if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then ++ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` -+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" ++ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` -+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" -+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH ++ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) else ++ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" HOST_LIBIDL_LIBS="$LIBIDL_LIBS" + fi +diff -Naur mozilla_old/nsprpub/config/rules.mk mozilla/nsprpub/config/rules.mk +--- mozilla_old/nsprpub/config/rules.mk 2006-02-22 04:33:33.000000000 +0200 ++++ mozilla/nsprpub/config/rules.mk 2006-06-07 00:07:06.000000000 +0300 +@@ -90,6 +90,8 @@ + CFLAGS=$(HOST_CFLAGS) + CXXFLAGS=$(HOST_CXXFLAGS) + LDFLAGS=$(HOST_LDFLAGS) ++RANLIB=$(HOST_RANLIB) ++AR=$(HOST_AR) + endif + endif + endif |