[MacPorts] #53651: wine, wine-crossover, wine-devel: add 64-bit support

MacPorts noreply at macports.org
Fri Mar 10 19:31:18 UTC 2017


#53651: wine, wine-crossover, wine-devel: add 64-bit support
---------------------------------------------+------------------------
  Reporter:  axet                            |      Owner:  ryandesign
      Type:  enhancement                     |     Status:  assigned
  Priority:  Normal                          |  Milestone:
 Component:  ports                           |    Version:
Resolution:                                  |   Keywords:
      Port:  wine wine-crossover wine-devel  |
---------------------------------------------+------------------------

Comment (by casr):

 I discovered the muniversal port group today and created the patch below.
 It's going in the right direction but be aware of:

   * that it currently does not download nor install wine-mono for x86_64
 version
   * `/opt/local/lib64` is created

 I tried `--libdir=${prefix}/lib` but `lipo` didn't know what to do with
 the fakedll directory so I'm leaving it for now.


 {{{
 --- x11/wine/Portfile.orig
 +++ x11/wine/Portfile
 @@ -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
 @@ -15,13 +16,14 @@ name                        wine
  conflicts                   wine-devel wine-crossover
  set my_name                 wine
  version                     2.0
 -revision                    1
 +revision                    3
  set branch                  [lindex [split ${version} .] 0].0
  license                     LGPL-2.1+
  categories                  x11
  maintainers                 ryandesign jwa openmaintainer
  homepage                    https://www.winehq.org
  platforms                   darwin
 +supported_archs             i386 x86_64
  use_bzip2                   yes
  distname                    ${my_name}-${version}
  dist_subdir                 ${my_name}
 @@ -94,6 +96,16 @@ patchfiles                  patch-BOOL.diff \
                              patch-fix_flicker.diff \
                              patch-mach_machine.diff

 +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
 @@ -113,6 +125,11 @@ configure.args              --without-alsa \
                              --without-v4l \
                              --without-x

 +configure.universal_args
 +
 +set merger_configure_args(x86_64) --enable-win64
 +set merger_configure_args(i386)   --with-
 wine64=${workpath}/${worksrcdir}-x86_64
 +
  # Wine has a native macOS driver since 1.5.26 so X11 is optional
  variant x11 {
    depends_lib-append          port:libGLU \
 @@ -136,11 +153,9 @@ variant x11 {
                                --x-lib=${prefix}/lib
  }

 -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
 +if {${build_arch} eq "x86_64"} {
 +    default_variants            +universal
 +}

  # llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but
 fails
  # to run:
 }}}

--
Ticket URL: <https://trac.macports.org/ticket/53651#comment:4>
MacPorts <https://www.macports.org/>
Ports system for macOS


More information about the macports-tickets mailing list