summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-07-20 07:08:15 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-20 07:08:15 +0000
commit57b832bfee7133f34e9645d36817b6f0aac2389b (patch)
tree17d7e9e4c0ad8072413ced6aaf0ab1b08d734ca8 /packages
parent89df0be3de939690b62afff589a4111181daccd3 (diff)
parent45d281319ccadc1e61280a7b40314168b89bec64 (diff)
merge of ae86a51b6b338f8674cb343b7489121aaf099abc
and f7ca9da6142ab119cb4999176caa84671258b1c8
Diffstat (limited to 'packages')
-rw-r--r--packages/mozilla/minimo/host_ldflags_fix.patch19
1 files changed, 7 insertions, 12 deletions
diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch
index 06028c9bf9..f4ff51fae1 100644
--- a/packages/mozilla/minimo/host_ldflags_fix.patch
+++ b/packages/mozilla/minimo/host_ldflags_fix.patch
@@ -1,9 +1,4 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mozilla/nsprpub/config/rules.mk~host_ldflags_fix.patch
+--- mozilla/nsprpub/config/rules.mk.old
+++ mozilla/nsprpub/config/rules.mk
@@ -87,6 +87,9 @@
CCC=$(HOST_CXX)
@@ -15,12 +10,12 @@
endif
endif
endif
---- mozilla/configure.in~host_ldflags_fix.patch
+--- mozilla/configure.in.old
+++ mozilla/configure.in
-@@ -5496,12 +5496,17 @@
+@@ -6098,12 +6098,17 @@
if test -n "$CROSS_COMPILE"; then
- if test -z "$HOST_LIBIDL_CONFIG"; then
+ if test -z "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
@@ -35,12 +30,12 @@
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
fi
---- mozilla/configure~host_ldflags_fix.patch
+--- mozilla/configure.old
+++ mozilla/configure
-@@ -16289,11 +16289,18 @@
+@@ -17604,11 +17604,18 @@
if test -n "$CROSS_COMPILE"; then
- if test -z "$HOST_LIBIDL_CONFIG"; then
+ if test -z "$HOST_LIBIDL_CONFIG"; then
+ echo "HOST_LIBIDL_CONFIG nto defined"
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi