[121458] users/mojca/ports/cross/mingw-w64/Portfile

[mojca at macports.org]

Revision: 121458
          https://trac.macports.org/changeset/121458
Author:   mojca at macports.org
Date:     2014-06-25 17:41:01 -0700 (Wed, 25 Jun 2014)
Log Message:
-----------
mojca/mingw-w64: fix directory structure for version 3

Modified Paths:
--------------
    users/mojca/ports/cross/mingw-w64/Portfile

Modified: users/mojca/ports/cross/mingw-w64/Portfile
===================================================================
--- users/mojca/ports/cross/mingw-w64/Portfile	2014-06-26 00:31:14 UTC (rev 121457)
+++ users/mojca/ports/cross/mingw-w64/Portfile	2014-06-26 00:41:01 UTC (rev 121458)
@@ -2,7 +2,7 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           GitHub 1.0
+PortGroup           github 1.0
 
 github.setup        mirror mingw-w64 3.1.0 v
 set mingw_name      w64-mingw32
@@ -35,26 +35,24 @@
 subport i686-${mingw_name}-crt {
     set mingw_arch  i686
     set mingw_dir   crt
-    set mingw_bits  32
 }
 subport x86_64-${mingw_name}-crt {
     set mingw_arch  x86_64
     set mingw_dir   crt
-    set mingw_bits  64
 }
 
 if {${subport} ne ${name}} {
     set mingw_target            ${mingw_arch}-${mingw_name}
     set mingw_prefix            ${prefix}/${mingw_target}
     configure.cmd               ${worksrcpath}/mingw-w64-${mingw_dir}/configure
-    configure.args-append       --prefix=${mingw_prefix} \
+    # TODO: remove one level in --prefix and --with-sysroot (but figure out how to do it consistently/properly)
+    configure.args-append       --prefix=${mingw_prefix}/${mingw_target} \
                                 --host=${mingw_target}
     configure.pre_args-delete   --prefix=${prefix}
 
     if {${mingw_dir} eq "headers"} {
         post-destroot {
-            file mkdir "${destroot}/${mingw_prefix}/mingw"
-            ln -s "../include" "${destroot}/${mingw_prefix}/mingw/include"
+            ln -s ${mingw_target} "${destroot}${mingw_prefix}/mingw"
         }
     }
 
@@ -64,8 +62,7 @@
                                 port:${mingw_target}-gcc \
                                 port:${mingw_target}-headers
         # maybe that's already default?
-        configure.args-append   --enable-lib${mingw_bits} \
-                                --with-sysroot=${mingw_prefix}
+        configure.args-append   --with-sysroot=${mingw_prefix}/${mingw_target}
         configure.cppflags      "-I${mingw_prefix}/include"
 
         # ----- from crossgcc (not sure if needed) ----
@@ -84,9 +81,10 @@
         # -----
 
         # is there a more elegant way?
-        # configure.cc  ${prefix}/bin/${mingw_target}-gcc
-        # configure.cxx ${prefix}/bin/${mingw_target}-g++
-        # configure.cpp ${prefix}/bin/${mingw_target}-cpp
+        configure.cc  ${prefix}/bin/${mingw_target}-gcc
+        configure.cxx ${prefix}/bin/${mingw_target}-g++
+        configure.cpp ${prefix}/bin/${mingw_target}-cpp
+        # configure.env-append PATH=...
     }
 
     destroot.violate_mtree  yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140625/8d723a4a/attachment-0001.html>