Bug 1046045 - Remove ${srcroot} from cfghdrs_in, cfgoutputs_in and cfghdrs_tup in jemalloc's configure. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 01 Aug 2014 15:55:56 +0900
changeset 197218 8d9d227f75ee4d284ba2e2645886081006cac60c
parent 197217 b894570f908386cb5f532f10678769d725e5a23f
child 197219 0d3520e9f0fb005f7701a2b48171556e0dfe515f
push id47073
push usermh@glandium.org
push dateFri, 01 Aug 2014 06:56:31 +0000
treeherdermozilla-inbound@0d3520e9f0fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1046045
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1046045 - Remove ${srcroot} from cfghdrs_in, cfgoutputs_in and cfghdrs_tup in jemalloc's configure. r=mshal
configure.in
memory/jemalloc/0009-Remove-srcroot-from-cfghdrs_in-cfgoutputs_in-and-cfg.patch
memory/jemalloc/src/Makefile.in
memory/jemalloc/src/configure
memory/jemalloc/src/configure.ac
memory/jemalloc/update.sh
--- a/configure.in
+++ b/configure.in
@@ -8955,23 +8955,17 @@ if test -z "$MOZ_NATIVE_JEMALLOC" -a "$M
   if test "$CROSS_COMPILE"; then
     ac_configure_args="$ac_configure_args je_cv_static_page_shift=12"
   fi
 
   if ! test -e memory/jemalloc; then
     mkdir -p memory/jemalloc
   fi
 
-  dnl jemalloc's configure uses $srcdir in AC_CONFIG_HEADERS, which syntax uses
-  dnl colons, conflicting with the windows-style path in $srcdir.
-  dnl Turn it into a msys path just for jemalloc's configure
-  _save_srcdir="$srcdir"
-  srcdir=`cd $srcdir; pwd`
   AC_OUTPUT_SUBDIRS(memory/jemalloc/src)
-  srcdir="$_save_srcdir"
   ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi
 
 # Run freetype configure script
 
 if test "$MOZ_TREE_FREETYPE"; then
    export CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS -std=c99"
    export CPPFLAGS="$CPPFLAGS $MOZ_DEBUG_FLAGS"
new file mode 100644
--- /dev/null
+++ b/memory/jemalloc/0009-Remove-srcroot-from-cfghdrs_in-cfgoutputs_in-and-cfg.patch
@@ -0,0 +1,225 @@
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,19 +37,19 @@ EXE := @exe@
+ LIBPREFIX := @libprefix@
+ REV := @rev@
+ install_suffix := @install_suffix@
+ ABI := @abi@
+ XSLTPROC := @XSLTPROC@
+ AUTOCONF := @AUTOCONF@
+ _RPATH = @RPATH@
+ RPATH = $(if $(1),$(call _RPATH,$(1)))
+-cfghdrs_in := @cfghdrs_in@
++cfghdrs_in := $(addprefix $(srcroot),@cfghdrs_in@)
+ cfghdrs_out := @cfghdrs_out@
+-cfgoutputs_in := @cfgoutputs_in@
++cfgoutputs_in := $(addprefix $(srcroot),@cfgoutputs_in@)
+ cfgoutputs_out := @cfgoutputs_out@
+ enable_autogen := @enable_autogen@
+ enable_code_coverage := @enable_code_coverage@
+ enable_experimental := @enable_experimental@
+ enable_zone_allocator := @enable_zone_allocator@
+ DSO_LDFLAGS = @DSO_LDFLAGS@
+ SOREV = @SOREV@
+ PIC_CFLAGS = @PIC_CFLAGS@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -5654,25 +5654,25 @@ else
+ fi
+ 
+ install_suffix="$INSTALL_SUFFIX"
+ 
+ 
+ je_="je_"
+ 
+ 
+-cfgoutputs_in="${srcroot}Makefile.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/html.xsl.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/manpages.xsl.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/jemalloc.xml.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_macros.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_protos.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/test.sh.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/include/test/jemalloc_test.h.in"
++cfgoutputs_in="Makefile.in"
++cfgoutputs_in="${cfgoutputs_in} doc/html.xsl.in"
++cfgoutputs_in="${cfgoutputs_in} doc/manpages.xsl.in"
++cfgoutputs_in="${cfgoutputs_in} doc/jemalloc.xml.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_macros.h.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_protos.h.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/internal/jemalloc_internal.h.in"
++cfgoutputs_in="${cfgoutputs_in} test/test.sh.in"
++cfgoutputs_in="${cfgoutputs_in} test/include/test/jemalloc_test.h.in"
+ 
+ cfgoutputs_out="Makefile"
+ cfgoutputs_out="${cfgoutputs_out} doc/html.xsl"
+ cfgoutputs_out="${cfgoutputs_out} doc/manpages.xsl"
+ cfgoutputs_out="${cfgoutputs_out} doc/jemalloc.xml"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_macros.h"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_protos.h"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/internal/jemalloc_internal.h"
+@@ -5684,28 +5684,28 @@ cfgoutputs_tup="${cfgoutputs_tup} doc/ht
+ cfgoutputs_tup="${cfgoutputs_tup} doc/manpages.xsl:doc/manpages.xsl.in"
+ cfgoutputs_tup="${cfgoutputs_tup} doc/jemalloc.xml:doc/jemalloc.xml.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_macros.h:include/jemalloc/jemalloc_macros.h.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_protos.h:include/jemalloc/jemalloc_protos.h.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/internal/jemalloc_internal.h"
+ cfgoutputs_tup="${cfgoutputs_tup} test/test.sh:test/test.sh.in"
+ cfgoutputs_tup="${cfgoutputs_tup} test/include/test/jemalloc_test.h:test/include/test/jemalloc_test.h.in"
+ 
+-cfghdrs_in="${srcroot}include/jemalloc/jemalloc_defs.h.in"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_namespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_unnamespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_symbols.txt"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_namespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_unnamespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/size_classes.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_rename.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_mangle.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}test/include/test/jemalloc_test_defs.h.in"
++cfghdrs_in="include/jemalloc/jemalloc_defs.h.in"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/jemalloc_internal_defs.h.in"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_namespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_unnamespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_symbols.txt"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_namespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_unnamespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/size_classes.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_rename.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_mangle.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc.sh"
++cfghdrs_in="${cfghdrs_in} test/include/test/jemalloc_test_defs.h.in"
+ 
+ cfghdrs_out="include/jemalloc/jemalloc_defs.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc${install_suffix}.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_namespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_unnamespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_symbols.txt"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_namespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_unnamespace.h"
+@@ -5713,18 +5713,18 @@ cfghdrs_out="${cfghdrs_out} include/jema
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_protos_jet.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_rename.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle_jet.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/jemalloc_internal_defs.h"
+ cfghdrs_out="${cfghdrs_out} test/include/test/jemalloc_test_defs.h"
+ 
+ cfghdrs_tup="include/jemalloc/jemalloc_defs.h:include/jemalloc/jemalloc_defs.h.in"
+-cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
+-cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:${srcroot}test/include/test/jemalloc_test_defs.h.in"
++cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:include/jemalloc/internal/jemalloc_internal_defs.h.in"
++cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:test/include/test/jemalloc_test_defs.h.in"
+ 
+ # Check whether --enable-cc-silence was given.
+ if test "${enable_cc_silence+set}" = set; then :
+   enableval=$enable_cc_silence; if test "x$enable_cc_silence" = "xno" ; then
+   enable_cc_silence="0"
+ else
+   enable_cc_silence="1"
+ fi
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -546,25 +546,25 @@ AC_ARG_WITH([install_suffix],
+ install_suffix="$INSTALL_SUFFIX"
+ AC_SUBST([install_suffix])
+ 
+ dnl Substitute @je_@ in jemalloc_protos.h.in, primarily to make generation of
+ dnl jemalloc_protos_jet.h easy.
+ je_="je_"
+ AC_SUBST([je_])
+ 
+-cfgoutputs_in="${srcroot}Makefile.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/html.xsl.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/manpages.xsl.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/jemalloc.xml.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_macros.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_protos.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal.h.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/test.sh.in"
+-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/include/test/jemalloc_test.h.in"
++cfgoutputs_in="Makefile.in"
++cfgoutputs_in="${cfgoutputs_in} doc/html.xsl.in"
++cfgoutputs_in="${cfgoutputs_in} doc/manpages.xsl.in"
++cfgoutputs_in="${cfgoutputs_in} doc/jemalloc.xml.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_macros.h.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_protos.h.in"
++cfgoutputs_in="${cfgoutputs_in} include/jemalloc/internal/jemalloc_internal.h.in"
++cfgoutputs_in="${cfgoutputs_in} test/test.sh.in"
++cfgoutputs_in="${cfgoutputs_in} test/include/test/jemalloc_test.h.in"
+ 
+ cfgoutputs_out="Makefile"
+ cfgoutputs_out="${cfgoutputs_out} doc/html.xsl"
+ cfgoutputs_out="${cfgoutputs_out} doc/manpages.xsl"
+ cfgoutputs_out="${cfgoutputs_out} doc/jemalloc.xml"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_macros.h"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_protos.h"
+ cfgoutputs_out="${cfgoutputs_out} include/jemalloc/internal/jemalloc_internal.h"
+@@ -576,28 +576,28 @@ cfgoutputs_tup="${cfgoutputs_tup} doc/ht
+ cfgoutputs_tup="${cfgoutputs_tup} doc/manpages.xsl:doc/manpages.xsl.in"
+ cfgoutputs_tup="${cfgoutputs_tup} doc/jemalloc.xml:doc/jemalloc.xml.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_macros.h:include/jemalloc/jemalloc_macros.h.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_protos.h:include/jemalloc/jemalloc_protos.h.in"
+ cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/internal/jemalloc_internal.h"
+ cfgoutputs_tup="${cfgoutputs_tup} test/test.sh:test/test.sh.in"
+ cfgoutputs_tup="${cfgoutputs_tup} test/include/test/jemalloc_test.h:test/include/test/jemalloc_test.h.in"
+ 
+-cfghdrs_in="${srcroot}include/jemalloc/jemalloc_defs.h.in"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_namespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_unnamespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_symbols.txt"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_namespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_unnamespace.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/size_classes.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_rename.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_mangle.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc.sh"
+-cfghdrs_in="${cfghdrs_in} ${srcroot}test/include/test/jemalloc_test_defs.h.in"
++cfghdrs_in="include/jemalloc/jemalloc_defs.h.in"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/jemalloc_internal_defs.h.in"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_namespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_unnamespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_symbols.txt"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_namespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_unnamespace.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/size_classes.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_rename.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_mangle.sh"
++cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc.sh"
++cfghdrs_in="${cfghdrs_in} test/include/test/jemalloc_test_defs.h.in"
+ 
+ cfghdrs_out="include/jemalloc/jemalloc_defs.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc${install_suffix}.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_namespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_unnamespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_symbols.txt"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_namespace.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_unnamespace.h"
+@@ -605,18 +605,18 @@ cfghdrs_out="${cfghdrs_out} include/jema
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_protos_jet.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_rename.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle_jet.h"
+ cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/jemalloc_internal_defs.h"
+ cfghdrs_out="${cfghdrs_out} test/include/test/jemalloc_test_defs.h"
+ 
+ cfghdrs_tup="include/jemalloc/jemalloc_defs.h:include/jemalloc/jemalloc_defs.h.in"
+-cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
+-cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:${srcroot}test/include/test/jemalloc_test_defs.h.in"
++cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:include/jemalloc/internal/jemalloc_internal_defs.h.in"
++cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:test/include/test/jemalloc_test_defs.h.in"
+ 
+ dnl Do not silence irrelevant compiler warnings by default, since enabling this
+ dnl option incurs a performance penalty.
+ AC_ARG_ENABLE([cc-silence],
+   [AS_HELP_STRING([--enable-cc-silence],
+                   [Silence irrelevant compiler warnings])],
+ [if test "x$enable_cc_silence" = "xno" ; then
+   enable_cc_silence="0"
--- a/memory/jemalloc/src/Makefile.in
+++ b/memory/jemalloc/src/Makefile.in
@@ -37,19 +37,19 @@ EXE := @exe@
 LIBPREFIX := @libprefix@
 REV := @rev@
 install_suffix := @install_suffix@
 ABI := @abi@
 XSLTPROC := @XSLTPROC@
 AUTOCONF := @AUTOCONF@
 _RPATH = @RPATH@
 RPATH = $(if $(1),$(call _RPATH,$(1)))
-cfghdrs_in := @cfghdrs_in@
+cfghdrs_in := $(addprefix $(srcroot),@cfghdrs_in@)
 cfghdrs_out := @cfghdrs_out@
-cfgoutputs_in := @cfgoutputs_in@
+cfgoutputs_in := $(addprefix $(srcroot),@cfgoutputs_in@)
 cfgoutputs_out := @cfgoutputs_out@
 enable_autogen := @enable_autogen@
 enable_code_coverage := @enable_code_coverage@
 enable_experimental := @enable_experimental@
 enable_zone_allocator := @enable_zone_allocator@
 DSO_LDFLAGS = @DSO_LDFLAGS@
 SOREV = @SOREV@
 PIC_CFLAGS = @PIC_CFLAGS@
--- a/memory/jemalloc/src/configure
+++ b/memory/jemalloc/src/configure
@@ -5654,25 +5654,25 @@ else
 fi
 
 install_suffix="$INSTALL_SUFFIX"
 
 
 je_="je_"
 
 
-cfgoutputs_in="${srcroot}Makefile.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/html.xsl.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/manpages.xsl.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/jemalloc.xml.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_macros.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_protos.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/test.sh.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/include/test/jemalloc_test.h.in"
+cfgoutputs_in="Makefile.in"
+cfgoutputs_in="${cfgoutputs_in} doc/html.xsl.in"
+cfgoutputs_in="${cfgoutputs_in} doc/manpages.xsl.in"
+cfgoutputs_in="${cfgoutputs_in} doc/jemalloc.xml.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_macros.h.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_protos.h.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/internal/jemalloc_internal.h.in"
+cfgoutputs_in="${cfgoutputs_in} test/test.sh.in"
+cfgoutputs_in="${cfgoutputs_in} test/include/test/jemalloc_test.h.in"
 
 cfgoutputs_out="Makefile"
 cfgoutputs_out="${cfgoutputs_out} doc/html.xsl"
 cfgoutputs_out="${cfgoutputs_out} doc/manpages.xsl"
 cfgoutputs_out="${cfgoutputs_out} doc/jemalloc.xml"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_macros.h"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_protos.h"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/internal/jemalloc_internal.h"
@@ -5684,28 +5684,28 @@ cfgoutputs_tup="${cfgoutputs_tup} doc/ht
 cfgoutputs_tup="${cfgoutputs_tup} doc/manpages.xsl:doc/manpages.xsl.in"
 cfgoutputs_tup="${cfgoutputs_tup} doc/jemalloc.xml:doc/jemalloc.xml.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_macros.h:include/jemalloc/jemalloc_macros.h.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_protos.h:include/jemalloc/jemalloc_protos.h.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/internal/jemalloc_internal.h"
 cfgoutputs_tup="${cfgoutputs_tup} test/test.sh:test/test.sh.in"
 cfgoutputs_tup="${cfgoutputs_tup} test/include/test/jemalloc_test.h:test/include/test/jemalloc_test.h.in"
 
-cfghdrs_in="${srcroot}include/jemalloc/jemalloc_defs.h.in"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_namespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_unnamespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_symbols.txt"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_namespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_unnamespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/size_classes.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_rename.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_mangle.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}test/include/test/jemalloc_test_defs.h.in"
+cfghdrs_in="include/jemalloc/jemalloc_defs.h.in"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/jemalloc_internal_defs.h.in"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_namespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_unnamespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_symbols.txt"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_namespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_unnamespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/size_classes.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_rename.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_mangle.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc.sh"
+cfghdrs_in="${cfghdrs_in} test/include/test/jemalloc_test_defs.h.in"
 
 cfghdrs_out="include/jemalloc/jemalloc_defs.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc${install_suffix}.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_namespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_unnamespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_symbols.txt"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_namespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_unnamespace.h"
@@ -5713,18 +5713,18 @@ cfghdrs_out="${cfghdrs_out} include/jema
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_protos_jet.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_rename.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle_jet.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/jemalloc_internal_defs.h"
 cfghdrs_out="${cfghdrs_out} test/include/test/jemalloc_test_defs.h"
 
 cfghdrs_tup="include/jemalloc/jemalloc_defs.h:include/jemalloc/jemalloc_defs.h.in"
-cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
-cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:${srcroot}test/include/test/jemalloc_test_defs.h.in"
+cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:include/jemalloc/internal/jemalloc_internal_defs.h.in"
+cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:test/include/test/jemalloc_test_defs.h.in"
 
 # Check whether --enable-cc-silence was given.
 if test "${enable_cc_silence+set}" = set; then :
   enableval=$enable_cc_silence; if test "x$enable_cc_silence" = "xno" ; then
   enable_cc_silence="0"
 else
   enable_cc_silence="1"
 fi
--- a/memory/jemalloc/src/configure.ac
+++ b/memory/jemalloc/src/configure.ac
@@ -546,25 +546,25 @@ AC_ARG_WITH([install_suffix],
 install_suffix="$INSTALL_SUFFIX"
 AC_SUBST([install_suffix])
 
 dnl Substitute @je_@ in jemalloc_protos.h.in, primarily to make generation of
 dnl jemalloc_protos_jet.h easy.
 je_="je_"
 AC_SUBST([je_])
 
-cfgoutputs_in="${srcroot}Makefile.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/html.xsl.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/manpages.xsl.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}doc/jemalloc.xml.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_macros.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/jemalloc_protos.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal.h.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/test.sh.in"
-cfgoutputs_in="${cfgoutputs_in} ${srcroot}test/include/test/jemalloc_test.h.in"
+cfgoutputs_in="Makefile.in"
+cfgoutputs_in="${cfgoutputs_in} doc/html.xsl.in"
+cfgoutputs_in="${cfgoutputs_in} doc/manpages.xsl.in"
+cfgoutputs_in="${cfgoutputs_in} doc/jemalloc.xml.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_macros.h.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/jemalloc_protos.h.in"
+cfgoutputs_in="${cfgoutputs_in} include/jemalloc/internal/jemalloc_internal.h.in"
+cfgoutputs_in="${cfgoutputs_in} test/test.sh.in"
+cfgoutputs_in="${cfgoutputs_in} test/include/test/jemalloc_test.h.in"
 
 cfgoutputs_out="Makefile"
 cfgoutputs_out="${cfgoutputs_out} doc/html.xsl"
 cfgoutputs_out="${cfgoutputs_out} doc/manpages.xsl"
 cfgoutputs_out="${cfgoutputs_out} doc/jemalloc.xml"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_macros.h"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/jemalloc_protos.h"
 cfgoutputs_out="${cfgoutputs_out} include/jemalloc/internal/jemalloc_internal.h"
@@ -576,28 +576,28 @@ cfgoutputs_tup="${cfgoutputs_tup} doc/ht
 cfgoutputs_tup="${cfgoutputs_tup} doc/manpages.xsl:doc/manpages.xsl.in"
 cfgoutputs_tup="${cfgoutputs_tup} doc/jemalloc.xml:doc/jemalloc.xml.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_macros.h:include/jemalloc/jemalloc_macros.h.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/jemalloc_protos.h:include/jemalloc/jemalloc_protos.h.in"
 cfgoutputs_tup="${cfgoutputs_tup} include/jemalloc/internal/jemalloc_internal.h"
 cfgoutputs_tup="${cfgoutputs_tup} test/test.sh:test/test.sh.in"
 cfgoutputs_tup="${cfgoutputs_tup} test/include/test/jemalloc_test.h:test/include/test/jemalloc_test.h.in"
 
-cfghdrs_in="${srcroot}include/jemalloc/jemalloc_defs.h.in"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_namespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_unnamespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/private_symbols.txt"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_namespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/public_unnamespace.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/internal/size_classes.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_rename.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc_mangle.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}include/jemalloc/jemalloc.sh"
-cfghdrs_in="${cfghdrs_in} ${srcroot}test/include/test/jemalloc_test_defs.h.in"
+cfghdrs_in="include/jemalloc/jemalloc_defs.h.in"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/jemalloc_internal_defs.h.in"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_namespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_unnamespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/private_symbols.txt"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_namespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/public_unnamespace.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/internal/size_classes.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_rename.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc_mangle.sh"
+cfghdrs_in="${cfghdrs_in} include/jemalloc/jemalloc.sh"
+cfghdrs_in="${cfghdrs_in} test/include/test/jemalloc_test_defs.h.in"
 
 cfghdrs_out="include/jemalloc/jemalloc_defs.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc${install_suffix}.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_namespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/private_unnamespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_symbols.txt"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_namespace.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/public_unnamespace.h"
@@ -605,18 +605,18 @@ cfghdrs_out="${cfghdrs_out} include/jema
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_protos_jet.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_rename.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/jemalloc_mangle_jet.h"
 cfghdrs_out="${cfghdrs_out} include/jemalloc/internal/jemalloc_internal_defs.h"
 cfghdrs_out="${cfghdrs_out} test/include/test/jemalloc_test_defs.h"
 
 cfghdrs_tup="include/jemalloc/jemalloc_defs.h:include/jemalloc/jemalloc_defs.h.in"
-cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:${srcroot}include/jemalloc/internal/jemalloc_internal_defs.h.in"
-cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:${srcroot}test/include/test/jemalloc_test_defs.h.in"
+cfghdrs_tup="${cfghdrs_tup} include/jemalloc/internal/jemalloc_internal_defs.h:include/jemalloc/internal/jemalloc_internal_defs.h.in"
+cfghdrs_tup="${cfghdrs_tup} test/include/test/jemalloc_test_defs.h:test/include/test/jemalloc_test_defs.h.in"
 
 dnl Do not silence irrelevant compiler warnings by default, since enabling this
 dnl option incurs a performance penalty.
 AC_ARG_ENABLE([cc-silence],
   [AS_HELP_STRING([--enable-cc-silence],
                   [Silence irrelevant compiler warnings])],
 [if test "x$enable_cc_silence" = "xno" ; then
   enable_cc_silence="0"
--- a/memory/jemalloc/update.sh
+++ b/memory/jemalloc/update.sh
@@ -17,13 +17,14 @@ rm -rf .git .gitignore autom4te.cache
 patch -p1 < ../0001-Use-a-configure-test-to-detect-whether-to-use-a-cons.patch
 patch -p1 < ../0002-Use-ULL-prefix-instead-of-LLU-for-unsigned-long-long.patch
 patch -p1 < ../0003-Don-t-use-msvc_compat-s-C99-headers-with-MSVC-versio.patch
 patch -p1 < ../0004-Try-to-use-__builtin_ffsl-if-ffsl-is-unavailable.patch
 patch -p1 < ../0005-Check-for-__builtin_ffsl-before-ffsl.patch
 patch -p1 < ../0006-Fix-clang-warnings.patch
 patch -p1 < ../0007-Ensure-the-default-purgeable-zone-is-after-the-defau.patch
 patch -p1 < ../0008-Allow-to-build-with-clang-cl.patch
+patch -p1 < ../0009-Remove-srcroot-from-cfghdrs_in-cfgoutputs_in-and-cfg.patch
 
 cd ..
 hg addremove -q src
 
 echo "jemalloc has now been updated.  Don't forget to run hg commit!"