Author: qboosh Date: Wed Jan 18 19:04:56 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted rpath patch: when RPATH is set, it has precedence over
LD_LIBRARY_PATH;
thus, when running just built binaries at build time, to avoid using already
installed
(possibly older) xulrunner-libs we must set LD_PRELOAD
---- Files affected:
packages/xulrunner:
xulrunner-rpath.patch (1.5 -> 1.6) , xulrunner.spec (1.205 -> 1.206)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-rpath.patch
diff -u packages/xulrunner/xulrunner-rpath.patch:1.5
packages/xulrunner/xulrunner-rpath.patch:1.6
--- packages/xulrunner/xulrunner-rpath.patch:1.5 Wed Mar 23 18:21:32 2011
+++ packages/xulrunner/xulrunner-rpath.patch Wed Jan 18 20:04:50 2012
@@ -20,3 +20,14 @@
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX)
$(XPCOM_FROZEN_LDOPTS)'
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-01-17
16:05:48.399452282 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk 2012-01-18
16:47:16.095761903 +0100
+@@ -436,7 +436,7 @@
+ endif
+
+ GENERATE_CACHE = \
+- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');"
&& \
++
LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');"
&& \
+ rm -rf jsloader && \
+ $(UNZIP) startupCache.zip && \
+ rm startupCache.zip && \
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.205
packages/xulrunner/xulrunner.spec:1.206
--- packages/xulrunner/xulrunner.spec:1.205 Tue Jan 17 21:22:29 2012
+++ packages/xulrunner/xulrunner.spec Wed Jan 18 20:04:50 2012
@@ -424,6 +424,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.206 2012/01/18 19:04:50 qboosh
+- adjusted rpath patch: when RPATH is set, it has precedence over
LD_LIBRARY_PATH;
+ thus, when running just built binaries at build time, to avoid using already
installed
+ (possibly older) xulrunner-libs we must set LD_PRELOAD
+
Revision 1.205 2012/01/17 20:22:29 qboosh
- added libpng patch to fix build with libpng 1.5.x
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-rpath.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.205&r2=1.206&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
