2 files changed, 34 insertions, 0 deletions

diff --git a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
new file mode 100644
index 0000000000..dad90771d0
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
@@ -0,0 +1,33 @@
+Fixes to enable building with latest autoconf and automake
+
+RP 2/2/10
+
+Index: offscreen/js/ctypes/libffi/configure.ac
+===================================================================
+--- offscreen.orig/js/ctypes/libffi/configure.ac        2010-02-01 14:25:48.859064666 +0000
++++ offscreen/js/ctypes/libffi/configure.ac     2010-02-01 14:26:54.097792073 +0000
+@@ -17,10 +17,10 @@
+ # the wrong, non-multilib-adjusted value will be used in multilibs.
+ # As a side effect, we have to subst CFLAGS ourselves.
+ 
+-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
++m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+ m4_define([_AC_ARG_VAR_PRECIOUS],[])
+ AC_PROG_CC
+-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
++m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+ 
+ AC_SUBST(CFLAGS)
+ 
+Index: offscreen/modules/libpr0n/build/Makefile.in
+===================================================================
+--- offscreen.orig/modules/libpr0n/build/Makefile.in    2010-01-14 12:06:49.000000000 +0000
++++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 16:58:01.177764887 +0000
+@@ -92,6 +92,7 @@
+ 
+ export::
+        @{ \
++       \
+        $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
+                echo "#define IMG_BUILD_DECODER_${d}";) \
+        $(foreach d,$(MOZ_IMG_ENCODERS), \
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index c95d08332a..5ebe1a4876 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -8,6 +8,7 @@ SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
            file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
            file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
            file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
+           file://autoconffix.patch;patch=1 \
            file://jsautocfg.h \
            file://mozconfig"
 PV = "0.2+hg-1.0+${SRCPV}"