Changes between Initial Version and Version 1 of Ticket #56991, comment 42


Ignore:
Timestamp:
Oct 7, 2019, 4:47:48 AM (20 months ago)
Author:
kencu (Ken)
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #56991, comment 42

    initial v1  
    1 A very similar patch works to enable `+universal` building against an SDK with MacPorts 2.6, happily. There is just one little change in the quoting that appears to be needed for the new MacPorts:
    2 {{{
    3 $ diff -u /opt/universalnew/libexec/macports/lib/port1.0/portconfigure.tcl.orig /opt/universalnew/libexec/macports/lib/port1.0/portconfigure.tcl
    4 --- /opt/universalnew/libexec/macports/lib/port1.0/portconfigure.tcl.orig       2019-09-21 16:25:24.000000000 -0700
    5 +++ /opt/universalnew/libexec/macports/lib/port1.0/portconfigure.tcl    2019-09-21 16:26:20.000000000 -0700
    6 @@ -1477,6 +1477,8 @@
    7                  append_to_environment_value configure $env_var -isysroot${configure.sdkroot}
    8              }
    9              append_to_environment_value configure "LDFLAGS" -Wl,-syslibroot,${configure.sdkroot}
    10 +            append_to_environment_value configure "SDKROOT" ${configure.sdkroot}
    11 +            append_to_environment_value configure "LDFLAGS" -Wl,-w
    12          }
    13  
    14          # add extra flags that are conditional on whether we're building universal
    15 $ diff -u /opt/universalnew/libexec/macports/lib/port1.0/portbuild.tcl.orig /opt/universalnew/libexec/macports/lib/port1.0/portbuild.tcl
    16 --- /opt/universalnew/libexec/macports/lib/port1.0/portbuild.tcl.orig   2019-09-21 16:27:06.000000000 -0700
    17 +++ /opt/universalnew/libexec/macports/lib/port1.0/portbuild.tcl        2019-09-21 16:55:49.000000000 -0700
    18 @@ -197,6 +197,12 @@
    19  
    20      set jobs_suffix [build_getjobsarg]
    21  
    22 +    global configure.sdkroot
    23 +       if {${configure.sdkroot} ne ""} {
    24 +        ui_notice "setting build SDKROOT to ${configure.sdkroot}"
    25 +               build.env-append "SDKROOT=${configure.sdkroot}"
    26 +       }
    27 +
    28      set realcmd ${build.cmd}
    29      set build.cmd "${build.cmd}$jobs_suffix"
    30      command_exec build
    31 $ diff -u /opt/universalnew/libexec/macports/lib/port1.0/portdestroot.tcl.orig /opt/universalnew/libexec/macports/lib/port1.0/portdestroot.tcl
    32 --- /opt/universalnew/libexec/macports/lib/port1.0/portdestroot.tcl.orig        2019-09-21 16:28:37.000000000 -0700
    33 +++ /opt/universalnew/libexec/macports/lib/port1.0/portdestroot.tcl     2019-09-21 17:01:43.000000000 -0700
    34 @@ -121,6 +121,13 @@
    35  }
    36  
    37  proc portdestroot::destroot_main {args} {
    38 +
    39 +    global configure.sdkroot
    40 +       if {${configure.sdkroot} ne ""} {
    41 +        ui_notice "setting destroot SDKROOT to ${configure.sdkroot}"
    42 +               destroot.env-append "SDKROOT=${configure.sdkroot}"
    43 +       }
    44 +
    45      command_exec destroot
    46      return 0
    47  }
    48 }}}
    49 
    50 With that (and the added SDK and small changes in `macports.conf` and `variants.conf` as above) wine builds through from start to finish without touching a thing.
    51 
    52 If you might be so kind, I'd like to see your newer `wine-devel` version. Can you give us a link to your `Portfile`?
     1Edit - no longer relevant with macports 2.6.1