diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/mozilla/minimo/host_ldflags_fix.patch | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/mozilla/minimo/host_ldflags_fix.patch')
-rw-r--r-- | meta/packages/mozilla/minimo/host_ldflags_fix.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/packages/mozilla/minimo/host_ldflags_fix.patch b/meta/packages/mozilla/minimo/host_ldflags_fix.patch new file mode 100644 index 0000000000..888f545e9d --- /dev/null +++ b/meta/packages/mozilla/minimo/host_ldflags_fix.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Index: mozilla/nsprpub/config/rules.mk | ||
2 | =================================================================== | ||
3 | --- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000 | ||
4 | +++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000 | ||
5 | @@ -87,6 +87,9 @@ | ||
6 | CCC=$(HOST_CXX) | ||
7 | CFLAGS=$(HOST_CFLAGS) | ||
8 | CXXFLAGS=$(HOST_CXXFLAGS) | ||
9 | +LDFLAGS=$(HOST_LDFLAGS) | ||
10 | +RANLIB=$(HOST_RANLIB) | ||
11 | +AR=$(HOST_AR) | ||
12 | endif | ||
13 | endif | ||
14 | endif | ||
15 | Index: mozilla/configure.in | ||
16 | =================================================================== | ||
17 | --- mozilla.orig/configure.in 2005-03-30 17:57:38.000000000 +0000 | ||
18 | +++ mozilla/configure.in 2005-09-30 11:36:44.000000000 +0000 | ||
19 | @@ -5612,13 +5612,18 @@ | ||
20 | fi | ||
21 | |||
22 | if test -n "$CROSS_COMPILE"; then | ||
23 | - if test -z "$HOST_LIBIDL_CONFIG"; then | ||
24 | + if test -z "$HOST_LIBIDL_CONFIG"; then | ||
25 | + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) | ||
26 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
27 | fi | ||
28 | if test -n "$HOST_LIBIDL_CONFIG"; then | ||
29 | + AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) | ||
30 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
31 | + AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) | ||
32 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
33 | + AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) | ||
34 | else | ||
35 | + AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) | ||
36 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
37 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||
38 | fi | ||
39 | Index: mozilla/configure | ||
40 | =================================================================== | ||
41 | --- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000 | ||
42 | +++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000 | ||
43 | @@ -16572,11 +16572,18 @@ | ||
44 | |||
45 | if test -n "$CROSS_COMPILE"; then | ||
46 | if test -z "$HOST_LIBIDL_CONFIG"; then | ||
47 | + echo "HOST_LIBIDL_CONFIG nto defined" | ||
48 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
49 | fi | ||
50 | - if test -n "$HOST_LIBIDL_CONFIG"; then | ||
51 | + if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then | ||
52 | + echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" | ||
53 | + _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH | ||
54 | + PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH | ||
55 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
56 | + echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" | ||
57 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
58 | + echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" | ||
59 | + PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH | ||
60 | else | ||
61 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
62 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||