summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-03-07 03:04:04 +0000
committerMike Frysinger <vapier@gentoo.org>2009-03-07 03:04:04 +0000
commit79bc5123be92c5751466c47383ea457a1b715395 (patch)
treef1fb94fe307520f7f99604f24b0991e38da968be /app-emulation
parentamd64 stable, bug 258468 (diff)
downloadgentoo-2-79bc5123be92c5751466c47383ea457a1b715395.tar.gz
gentoo-2-79bc5123be92c5751466c47383ea457a1b715395.tar.bz2
gentoo-2-79bc5123be92c5751466c47383ea457a1b715395.zip
tweak patch a bit so it works
(Portage version: 2.2_rc23/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/wine/files/wine-1.1.15-winegcc.patch16
1 files changed, 14 insertions, 2 deletions
diff --git a/app-emulation/wine/files/wine-1.1.15-winegcc.patch b/app-emulation/wine/files/wine-1.1.15-winegcc.patch
index e8430b35827d..6e5bb22a5359 100644
--- a/app-emulation/wine/files/wine-1.1.15-winegcc.patch
+++ b/app-emulation/wine/files/wine-1.1.15-winegcc.patch
@@ -2,8 +2,14 @@ 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 @@
+@@ -215,10 +215,13 @@
+ strarray* files;
+ };
+
++#undef FORCE_POINTER_SIZE
+ #ifdef __i386__
static const enum target_cpu build_cpu = CPU_x86;
++#define FORCE_POINTER_SIZE
#elif defined(__x86_64__)
static const enum target_cpu build_cpu = CPU_x86_64;
+#define FORCE_POINTER_SIZE
@@ -22,8 +28,14 @@ http://bugs.gentoo.org/260726
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 @@
+@@ -50,10 +50,13 @@
+ int link_ext_symbols = 0;
+ int force_pointer_size = 0;
+
++#undef FORCE_POINTER_SIZE
+ #ifdef __i386__
enum target_cpu target_cpu = CPU_x86;
++#define FORCE_POINTER_SIZE
#elif defined(__x86_64__)
enum target_cpu target_cpu = CPU_x86_64;
+#define FORCE_POINTER_SIZE