mozilla-headless: Add patch to remove bad rpath-link options from the linker commands

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 28 insertions, 1 deletions

diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
new file mode 100644
index 0000000000..9409105780
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
@@ -0,0 +1,26 @@
+Index: offscreen/js/src/configure.in
+===================================================================
+--- offscreen.orig/js/src/configure.in  2009-06-17 14:31:40.000000000 +0100
++++ offscreen/js/src/configure.in       2009-06-17 14:31:40.000000000 +0100
+@@ -880,7 +880,7 @@
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+ 
+ MOZ_JS_LIBS='-L$(libdir) -lmozjs'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
+ 
+ MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
+ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
+Index: offscreen/configure.in
+===================================================================
+--- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
++++ offscreen/configure.in      2009-06-17 15:10:00.000000000 +0100
+@@ -1060,7 +1060,7 @@
+ 
+ MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index 73a12a81b1..fb24cd9ef4 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -5,10 +5,11 @@ SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=${FIXEDREV};module=of
            file://configurefix.patch;patch=1 \
            file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
            file://mozilla-jemalloc.patch;patch=1 \
+           file://removebadrpath.patch;patch=1 \
            file://jsautocfg.h \
            file://mozconfig"
 PV = "0.0+hg-1.0+${FIXEDREV}"
-PR = "r3"
+PR = "r5"
 
 S = "${WORKDIR}/offscreen"