| 1 |
tetromino 12/02/05 21:15:06 |
| 2 |
|
| 3 |
Added: wine-1.4_rc2-multilib-portage.patch |
| 4 |
Log: |
| 5 |
Bump, see http://www.winehq.org/announce/1.4-rc2 for the announcement. Add patch by Thomas Sachau to (hopefully) finally fix bug #395615. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wine-1.4_rc2-multilib-portage.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/show_bug.cgi?id=395615 |
| 18 |
|
| 19 |
Explicitly add the required -m32/m64 to *FLAGS; this overrides any |
| 20 |
arch-specific -m* flags that may have been appended by multilib-portage. |
| 21 |
|
| 22 |
Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be |
| 23 |
explicitly added to CC and CXX due to wine's build system. For example, |
| 24 |
winegcc saves the build-time value of CC and uses it at runtime. |
| 25 |
|
| 26 |
--- a/configure.ac |
| 27 |
+++ b/configure.ac |
| 28 |
@@ -133,12 +133,18 @@ |
| 29 |
then |
| 30 |
CC="$CC -m64" |
| 31 |
CXX="$CXX -m64" |
| 32 |
+ CFLAGS="$CFLAGS -m64" |
| 33 |
+ LDFLAGS="$LDFLAGS -m64" |
| 34 |
+ CXXFLAGS="$CXXFLAGS -m64" |
| 35 |
host_cpu="x86_64" |
| 36 |
notice_platform="64-bit " |
| 37 |
AC_SUBST(TARGETFLAGS,"-m64") |
| 38 |
else |
| 39 |
CC="$CC -m32" |
| 40 |
CXX="$CXX -m32" |
| 41 |
+ CFLAGS="$CFLAGS -m32" |
| 42 |
+ LDFLAGS="$LDFLAGS -m32" |
| 43 |
+ CXXFLAGS="$CXXFLAGS -m32" |
| 44 |
host_cpu="i386" |
| 45 |
notice_platform="32-bit " |
| 46 |
AC_SUBST(TARGETFLAGS,"-m32") |
| 47 |
@@ -150,6 +156,9 @@ |
| 48 |
then |
| 49 |
CC="$CC -m32" |
| 50 |
CXX="$CXX -m32" |
| 51 |
+ CFLAGS="$CFLAGS -m32" |
| 52 |
+ LDFLAGS="$LDFLAGS -m32" |
| 53 |
+ CXXFLAGS="$CXXFLAGS -m32" |
| 54 |
AC_MSG_CHECKING([whether $CC works]) |
| 55 |
AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), |
| 56 |
[AC_MSG_RESULT([no]) |
Archives