Skip to content
Permalink
Browse files

wine: add 64-bit support

  • Loading branch information
casr authored and raimue committed Apr 22, 2017
1 parent b51e624 commit 85383ac1d3b949194b92ad3af0fe9402833ae587
Showing with 40 additions and 3 deletions.
  1. +21 −3 x11/wine/Portfile
  2. +19 −0 x11/wine/files/patch-configure.diff
@@ -1,6 +1,7 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

PortSystem 1.0
PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0

# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
@@ -19,6 +20,7 @@ categories x11
maintainers {ryandesign @ryandesign} openmaintainer
homepage https://www.winehq.org
platforms darwin
supported_archs i386 x86_64
use_xz yes
distname ${my_name}-${version}
dist_subdir ${my_name}
@@ -90,10 +92,21 @@ depends_build port:bison \
port:pkgconfig

patchfiles BOOL.patch \
patch-configure.diff \
cups_headers.patch \
fix-flicker.patch \
mach_machine.patch

pre-configure {
if {[variant_isset universal]} {
foreach arch ${universal_archs_to_use} {
file mkdir ${worksrcpath}-${arch}
}

configure.cmd ${worksrcpath}/configure
}
}

# Wine requires the program specified in INSTALL to create intermediate
# directories; /usr/bin/install doesn't.
# http://bugs.winehq.org/show_bug.cgi?id=35310
@@ -191,9 +204,14 @@ variant x11 {

default_variants +x11

# 64-bit Wine exists for Linux, but does not work on OS X.
# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
supported_archs i386
configure.universal_args

set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64

if {${build_arch} eq "x86_64"} {
default_variants +universal
}

# error: Xcode 3.x cannot build 16-bit code correctly
compiler.blacklist-append {gcc-4.2 < 5600}
@@ -0,0 +1,19 @@
# Output DLLs to different directories so that we don't have a clash when
# they're merged back together

--- configure.orig
+++ configure
@@ -7320,7 +7320,12 @@



-dlldir="\${libdir}/wine"
+if test "x$enable_win64" = "xyes"
+then
+ dlldir="\${libdir}/wine64"
+else
+ dlldir="\${libdir}/wine"
+fi

DLLFLAGS="-D_REENTRANT"

0 comments on commit 85383ac

Please sign in to comment.
You can’t perform that action at this time.