diff options
| author | Camillo Lugaresi | 2011-08-01 21:26:45 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2011-08-01 16:43:33 -0700 |
| commit | 0a892497e153762cdcffa66898966a2b3c60e1ee (patch) | |
| tree | 33534d821e09cbca8b365701efef27fe48d4de57 /Library/Formula/wine.rb | |
| parent | 8d9adbd29f76596db8a11fac176fa8404517e093 (diff) | |
| download | homebrew-0a892497e153762cdcffa66898966a2b3c60e1ee.tar.bz2 | |
wine: apply upstream fix for Lion compatibility
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula/wine.rb')
| -rw-r--r-- | Library/Formula/wine.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb index 873f4fb6f..4c1834693 100644 --- a/Library/Formula/wine.rb +++ b/Library/Formula/wine.rb @@ -69,6 +69,15 @@ EOS (bin+'wine').write(wine_wrapper) end + # There is a bug in the Lion version of ld that prevents Wine from building + # correctly; see <http://bugs.winehq.org/show_bug.cgi?id=27929> + # We have backported Camillo Lugaresi's patch from upstream. The patch can + # be removed from this formula once it lands in both the devel and stable + # branches of Wine. + if MacOS.lion? + def patches; DATA; end + end + def caveats; <<-EOS.undent For a more full-featured install, try: http://code.google.com/p/osxwinebuilder/ @@ -81,3 +90,19 @@ EOS EOS end end + + +__END__ +diff --git a/configure b/configure +index e8bc505..4b9a6d4 100755 +--- a/configure ++++ b/configure +@@ -6417,7 +6417,7 @@ fi + + APPLICATIONSERVICESLIB="-framework ApplicationServices" + +- LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000" ++ LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + + if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" + then |