mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 683975 - Need infra for developer contributed compilers. r=rail.
--HG-- extra : rebase_source : b5b616042e629be4c9cd1c8bc7217bc15f4d4a1c
This commit is contained in:
parent
093713e2b2
commit
24cec8137f
@ -64,6 +64,7 @@ def build_glibc_aux(stage_dir, inst_dir):
|
||||
"--enable-add-ons=nptl",
|
||||
"--without-selinux",
|
||||
"--enable-kernel=2.6.18",
|
||||
"--libdir=%s/lib64" % inst_dir,
|
||||
"--prefix=%s" % inst_dir])
|
||||
|
||||
def build_one_stage(env, stage_dir, is_stage_one):
|
||||
@ -104,10 +105,23 @@ def build_one_stage_aux(stage_dir, is_stage_one):
|
||||
"--disable-bootstrap"]
|
||||
if is_stage_one:
|
||||
gcc_configure_args.append("--enable-languages=c")
|
||||
gcc_configure_args.append("--disable-multilib")
|
||||
# We build the stage1 gcc without shared libraries. Otherwise its
|
||||
# libgcc.so would depend on the system libc.so, which causes problems
|
||||
# when it tries to use that libgcc.so and the libc we are about to
|
||||
# build.
|
||||
gcc_configure_args.append("--disable-shared")
|
||||
else:
|
||||
gcc_configure_args.append("--enable-languages=c,c++")
|
||||
|
||||
build_package(gcc_source_dir, gcc_build_dir, gcc_configure_args)
|
||||
|
||||
if is_stage_one:
|
||||
# The glibc build system uses -lgcc_eh, but at least in this setup
|
||||
# libgcc.a has all it needs.
|
||||
d = tool_inst_dir + "/lib/gcc/x86_64-unknown-linux-gnu/4.5.2/"
|
||||
os.symlink(d + "libgcc.a", d + "libgcc_eh.a")
|
||||
|
||||
build_glibc({"CC" : tool_inst_dir + "/bin/gcc",
|
||||
"CXX" : tool_inst_dir + "/bin/g++"},
|
||||
stage_dir, tool_inst_dir)
|
||||
|
36
build/unix/build-toolchain/glibc-deterministic.patch
Normal file
36
build/unix/build-toolchain/glibc-deterministic.patch
Normal file
@ -0,0 +1,36 @@
|
||||
diff -ru a/configure.in b/configure.in
|
||||
--- a/configure.in 2011-01-17 23:34:07.000000000 -0500
|
||||
+++ b/configure.in 2012-01-25 20:40:27.919485606 -0500
|
||||
@@ -2230,6 +2230,7 @@
|
||||
fi
|
||||
AC_SUBST(old_glibc_headers)
|
||||
|
||||
+libc_cv_slibdir=${prefix}/lib64
|
||||
AC_SUBST(libc_cv_slibdir)
|
||||
AC_SUBST(libc_cv_localedir)
|
||||
AC_SUBST(libc_cv_sysconfdir)
|
||||
diff -ru a/csu/Makefile b/csu/Makefile
|
||||
--- a/csu/Makefile 2011-01-17 23:34:07.000000000 -0500
|
||||
+++ b/csu/Makefile 2012-01-23 13:58:28.957792633 -0500
|
||||
@@ -234,8 +234,7 @@
|
||||
if [ -z "$$os" ]; then \
|
||||
os=Linux; \
|
||||
fi; \
|
||||
- printf '"Compiled on a %s %s system on %s.\\n"\n' \
|
||||
- "$$os" "$$version" "`date +%Y-%m-%d`";; \
|
||||
+ ;; \
|
||||
*) ;; \
|
||||
esac; \
|
||||
files="$(all-Banner-files)"; \
|
||||
diff -ru a/nscd/nscd_stat.c b/nscd/nscd_stat.c
|
||||
--- a/nscd/nscd_stat.c 2011-01-17 23:34:07.000000000 -0500
|
||||
+++ b/nscd/nscd_stat.c 2012-01-23 15:54:45.231607606 -0500
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
|
||||
/* We use this to make sure the receiver is the same. */
|
||||
-static const char compilation[21] = __DATE__ " " __TIME__;
|
||||
+static const char compilation[21] = "don't need this";
|
||||
|
||||
/* Statistic data for one database. */
|
||||
struct dbstat
|
Loading…
Reference in New Issue
Block a user