summaryrefslogtreecommitdiffstats
path: root/meta/packages/mozilla/minimo/host_ldflags_fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/mozilla/minimo/host_ldflags_fix.patch')
-rw-r--r--meta/packages/mozilla/minimo/host_ldflags_fix.patch82
1 files changed, 38 insertions, 44 deletions
diff --git a/meta/packages/mozilla/minimo/host_ldflags_fix.patch b/meta/packages/mozilla/minimo/host_ldflags_fix.patch
index 888f545e9d..de48d8eb8e 100644
--- a/meta/packages/mozilla/minimo/host_ldflags_fix.patch
+++ b/meta/packages/mozilla/minimo/host_ldflags_fix.patch
@@ -1,62 +1,56 @@
1Index: mozilla/nsprpub/config/rules.mk 1diff -Naur mozilla_old/configure mozilla/configure
2=================================================================== 2--- mozilla_old/configure 2006-06-03 23:44:17.000000000 +0300
3--- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000 3+++ mozilla/configure 2006-06-07 00:16:15.000000000 +0300
4+++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000 4@@ -18755,11 +18755,18 @@
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
15Index: 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 5
22 if test -n "$CROSS_COMPILE"; then 6 if test -n "$CROSS_COMPILE"; then
23- if test -z "$HOST_LIBIDL_CONFIG"; then 7 if test -z "$HOST_LIBIDL_CONFIG"; then
24+ if test -z "$HOST_LIBIDL_CONFIG"; then 8+ echo "HOST_LIBIDL_CONFIG not defined"
25+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
26 HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" 9 HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
27 fi 10 fi
28 if test -n "$HOST_LIBIDL_CONFIG"; then 11- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
29+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) 12+ if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no" && test -n "$HOST_PKG_CONFIG_PATH"; then
13+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
14+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
15+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
30 HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` 16 HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
31+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) 17+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
32 HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` 18 HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
33+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) 19+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
20+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
34 else 21 else
35+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
36 HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" 22 HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
37 HOST_LIBIDL_LIBS="$LIBIDL_LIBS" 23 HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
38 fi 24diff -Naur mozilla_old/configure.in mozilla/configure.in
39Index: mozilla/configure 25--- mozilla_old/configure.in 2006-06-03 23:35:20.000000000 +0300
40=================================================================== 26+++ mozilla/configure.in 2006-06-07 00:10:26.000000000 +0300
41--- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000 27@@ -6870,12 +6870,17 @@
42+++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000
43@@ -16572,11 +16572,18 @@
44 28
45 if test -n "$CROSS_COMPILE"; then 29 if test -n "$CROSS_COMPILE"; then
46 if test -z "$HOST_LIBIDL_CONFIG"; then 30 if test -z "$HOST_LIBIDL_CONFIG"; then
47+ echo "HOST_LIBIDL_CONFIG nto defined" 31+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
48 HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" 32 HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
49 fi 33 fi
50- if test -n "$HOST_LIBIDL_CONFIG"; then 34 if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
51+ if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then 35+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
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` 36 HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
56+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" 37+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
57 HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` 38 HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
58+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" 39+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
59+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
60 else 40 else
41+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
61 HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" 42 HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
62 HOST_LIBIDL_LIBS="$LIBIDL_LIBS" 43 HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
44 fi
45diff -Naur mozilla_old/nsprpub/config/rules.mk mozilla/nsprpub/config/rules.mk
46--- mozilla_old/nsprpub/config/rules.mk 2006-02-22 04:33:33.000000000 +0200
47+++ mozilla/nsprpub/config/rules.mk 2006-06-07 00:07:06.000000000 +0300
48@@ -90,6 +90,8 @@
49 CFLAGS=$(HOST_CFLAGS)
50 CXXFLAGS=$(HOST_CXXFLAGS)
51 LDFLAGS=$(HOST_LDFLAGS)
52+RANLIB=$(HOST_RANLIB)
53+AR=$(HOST_AR)
54 endif
55 endif
56 endif
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-19 23:05:31 +0000