mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
226 lines
13 KiB
Diff
226 lines
13 KiB
Diff
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"
|