Date: Mon, 21 Jul 2014 18:55:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1632 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201407211855.s6LItm9p091796@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jul 21 18:55:47 2014 New Revision: 1632 Log: actually link in DTRACE probes Added: trunk/mail/thunderbird/files/patch-bug702179 trunk/www/firefox-esr/files/patch-bug702179 trunk/www/firefox-nightly/files/patch-bug702179 trunk/www/firefox/files/patch-bug702179 trunk/www/libxul/files/patch-bug702179 trunk/www/seamonkey/files/patch-bug702179 Added: trunk/mail/thunderbird/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,36 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- mozilla/js/src/Makefile.in ++++ mozilla/js/src/Makefile.in +@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') + STATIC_LIBRARY_NAME = js_static + LIBS = $(NSPR_LIBS) + +-DIST_INSTALL = 1 +- + ifdef JS_STANDALONE + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) + ifndef MOZ_NATIVE_ZLIB Added: trunk/www/firefox-esr/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,35 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- configure.in ++++ configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY + FORCE_SHARED_LIB = 1 + endif + FORCE_STATIC_LIB = 1 +-DIST_INSTALL = 1 + + ############################################### + # BEGIN include sources for low-level code shared with mfbt Added: trunk/www/firefox-nightly/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,36 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- configure.in ++++ configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') + STATIC_LIBRARY_NAME = js_static + LIBS = $(NSPR_LIBS) + +-DIST_INSTALL = 1 +- + ifdef JS_STANDALONE + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) + ifndef MOZ_NATIVE_ZLIB Added: trunk/www/firefox/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,36 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- configure.in ++++ configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') + STATIC_LIBRARY_NAME = js_static + LIBS = $(NSPR_LIBS) + +-DIST_INSTALL = 1 +- + ifdef JS_STANDALONE + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) + ifndef MOZ_NATIVE_ZLIB Added: trunk/www/libxul/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,35 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- configure.in ++++ configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY + FORCE_SHARED_LIB = 1 + endif + FORCE_STATIC_LIB = 1 +-DIST_INSTALL = 1 + + ############################################### + # BEGIN include sources for low-level code shared with mfbt Added: trunk/www/seamonkey/files/patch-bug702179 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug702179 Mon Jul 21 18:55:47 2014 (r1632) @@ -0,0 +1,36 @@ +commit 6ddaacd +Author: Ginn Chen <ginn.chen@oracle.com> +Date: Wed Nov 30 07:23:46 2011 +0800 + + Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium +--- + configure.in | 2 +- + js/src/Makefile.in | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git configure.in configure.in +index 66549c1..75b848d 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' + MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation + MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' + +-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' ++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' + MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' + MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' + XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' +diff --git js/src/Makefile.in js/src/Makefile.in +index e28160a..28ca5e8 100644 +--- mozilla/js/src/Makefile.in ++++ mozilla/js/src/Makefile.in +@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') + STATIC_LIBRARY_NAME = js_static + LIBS = $(NSPR_LIBS) + +-DIST_INSTALL = 1 +- + ifdef JS_STANDALONE + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) + ifndef MOZ_NATIVE_ZLIB
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407211855.s6LItm9p091796>