diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-03-06 08:26:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-03-06 08:26:30 +0000 |
| commit | 5bff733021353bd051155d6705c7f25ad139945e (patch) | |
| tree | 1902b26549619fa6b62ba59cfbf72a92a4585de2 /app-emulation/wine/files | |
| parent | Fix stream encoding in rdf_write_xml/2 (diff) | |
| download | gentoo-2-5bff733021353bd051155d6705c7f25ad139945e.tar.gz gentoo-2-5bff733021353bd051155d6705c7f25ad139945e.tar.bz2 gentoo-2-5bff733021353bd051155d6705c7f25ad139945e.zip | |
Workaround multilib breakage in upstream wine tools #260726.
(Portage version: 2.2_rc23/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'app-emulation/wine/files')
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.15-configure-host.patch | 13 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.15-winegcc.patch | 43 |
2 files changed, 56 insertions, 0 deletions
diff --git a/app-emulation/wine/files/wine-1.1.15-configure-host.patch b/app-emulation/wine/files/wine-1.1.15-configure-host.patch new file mode 100644 index 000000000000..47628f66ddd1 --- /dev/null +++ b/app-emulation/wine/files/wine-1.1.15-configure-host.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/260726 + +--- wine-1.1.15/configure ++++ wine-1.1.15/configure +@@ -3943,7 +3943,7 @@ + $as_echo "$wine_cv_toolsdir" >&6; } + TOOLSDIR=$wine_cv_toolsdir + +-if test -n "$host_alias" ++if test -n "$host_alias" -a "$host_alias" != "$build_alias" + then + TARGETFLAGS="-b $host_alias $TARGETFLAGS" + diff --git a/app-emulation/wine/files/wine-1.1.15-winegcc.patch b/app-emulation/wine/files/wine-1.1.15-winegcc.patch new file mode 100644 index 000000000000..e8430b35827d --- /dev/null +++ b/app-emulation/wine/files/wine-1.1.15-winegcc.patch @@ -0,0 +1,43 @@ +http://bugs.gentoo.org/260726 + +--- wine-1.1.15/tools/winegcc/winegcc.c ++++ wine-1.1.15/tools/winegcc/winegcc.c +@@ -215,6 +215,7 @@ + static const enum target_cpu build_cpu = CPU_x86; + #elif defined(__x86_64__) + static const enum target_cpu build_cpu = CPU_x86_64; ++#define FORCE_POINTER_SIZE + #elif defined(__sparc__) + static const enum target_cpu build_cpu = CPU_SPARC; + #elif defined(__ALPHA__) +@@ -968,6 +971,9 @@ + opts.linker_args = strarray_alloc(); + opts.compiler_args = strarray_alloc(); + opts.winebuild_args = strarray_alloc(); ++#ifdef FORCE_POINTER_SIZE ++ opts.force_pointer_size = sizeof(size_t); ++#endif + + /* determine the processor type */ + if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; +--- wine-1.1.15/tools/winebuild/main.c ++++ wine-1.1.15/tools/winebuild/main.c +@@ -50,6 +50,7 @@ + enum target_cpu target_cpu = CPU_x86; + #elif defined(__x86_64__) + enum target_cpu target_cpu = CPU_x86_64; ++#define FORCE_POINTER_SIZE + #elif defined(__sparc__) + enum target_cpu target_cpu = CPU_SPARC; + #elif defined(__ALPHA__) +@@ -574,6 +577,10 @@ + signal( SIGTERM, exit_on_signal ); + signal( SIGINT, exit_on_signal ); + ++#ifdef FORCE_POINTER_SIZE ++ force_pointer_size = sizeof(size_t); ++#endif ++ + output_file = stdout; + argv = parse_options( argc, argv, spec ); + |