[91746] trunk/dports/python/py-wxpython

[jwa at macports.org]

Revision: 91746
          https://trac.macports.org/changeset/91746
Author:   jwa at macports.org
Date:     2012-04-09 08:03:48 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
modify the build process to use the right compiler, patch the patch file to define the SDK to provide 32-bit QD types

Modified Paths:
--------------
    trunk/dports/python/py-wxpython/Portfile

Added Paths:
-----------
    trunk/dports/python/py-wxpython/files/patch-config.py.diff.in

Removed Paths:
-------------
    trunk/dports/python/py-wxpython/files/patch-config.py.diff

Modified: trunk/dports/python/py-wxpython/Portfile
===================================================================
--- trunk/dports/python/py-wxpython/Portfile	2012-04-09 13:57:03 UTC (rev 91745)
+++ trunk/dports/python/py-wxpython/Portfile	2012-04-09 15:03:48 UTC (rev 91746)
@@ -6,6 +6,7 @@
 
 name			py-wxpython
 version			2.8.12.1
+revision		1
 categories		python graphics
 platforms		darwin
 python.versions	24 25 27
@@ -42,7 +43,29 @@
 
 destroot.env	UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx-devel/bin:$env(PATH)"
 
+pre-fetch {
+    touch ${portpath}/files/patch-config.py.diff
+}
+
+pre-patch {
+    delete ${portpath}/files/patch-config.py.diff
+    copy ${portpath}/files/patch-config.py.diff.in \
+        ${portpath}/files/patch-config.py.diff
+    if {[vercmp $xcodeversion 4.3] >= 0} {
+        reinplace "s;@developer_dir@;${developer_dir}/Platforms/MacOSX.platform/Developer;" ${portpath}/files/patch-config.py.diff
+    } else {
+        reinplace "s;@developer_dir@;${developer_dir};" ${portpath}/files/patch-config.py.diff
+    }
+}
+
+
 if {${os.platform} == "darwin" && ${os.major} >= 10} {
+    build.env-append	CC=${configure.cc} \
+        CXX=${configure.cxx} \
+        CPP=${configure.cpp}
+    destroot.env-append	CC=${configure.cc} \
+            CXX=${configure.cxx} \
+            CPP=${configure.cpp}
     patchfiles		patch-config.py.diff
 }
 

Deleted: trunk/dports/python/py-wxpython/files/patch-config.py.diff
===================================================================
--- trunk/dports/python/py-wxpython/files/patch-config.py.diff	2012-04-09 13:57:03 UTC (rev 91745)
+++ trunk/dports/python/py-wxpython/files/patch-config.py.diff	2012-04-09 15:03:48 UTC (rev 91746)
@@ -1,27 +0,0 @@
---- config.py	2011-12-04 12:28:13.000000000 +0200
-+++ config.py	2011-12-04 12:36:13.000000000 +0200
-@@ -1031,19 +1031,11 @@
-         GENDIR = 'mac'
-         libs = ['stdc++']
-         NO_SCRIPTS = 1
--        if not ARCH == "":
--            cflags.append("-arch")
--            cflags.append(ARCH)
--            lflags.append("-arch")
--            lflags.append(ARCH)
--            #if ARCH == "ppc":
--            #    cflags.append("-isysroot")
--            #    cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk")
--
--        if not os.environ.get('CC') or not os.environ.get('CXX'):
--            os.environ["CXX"] = "g++-4.0"
--            os.environ["CC"]  = "gcc-4.0"
--            os.environ["CPP"] = "cpp-4.0"
-+        os.environ["CXX"] = "llvm-g++-4.2"
-+        os.environ["CC"]  = "llvm-gcc-4.2"
-+        os.environ["CPP"] = "llvm-cpp-4.2"
-+        cflags.append("-isysroot")
-+        cflags.append("/Developer/SDKs/MacOSX10.6.sdk")
- 
-     else:
-         # Set flags for other Unix type platforms

Added: trunk/dports/python/py-wxpython/files/patch-config.py.diff.in
===================================================================
--- trunk/dports/python/py-wxpython/files/patch-config.py.diff.in	                        (rev 0)
+++ trunk/dports/python/py-wxpython/files/patch-config.py.diff.in	2012-04-09 15:03:48 UTC (rev 91746)
@@ -0,0 +1,24 @@
+--- config.py~	2012-04-08 18:41:21.000000000 +0300
++++ config.py	2012-04-08 18:44:32.000000000 +0300
+@@ -1031,19 +1031,8 @@
+         GENDIR = 'mac'
+         libs = ['stdc++']
+         NO_SCRIPTS = 1
+-        if not ARCH == "":
+-            cflags.append("-arch")
+-            cflags.append(ARCH)
+-            lflags.append("-arch")
+-            lflags.append(ARCH)
+-            #if ARCH == "ppc":
+-            #    cflags.append("-isysroot")
+-            #    cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk")
+-
+-        if not os.environ.get('CC') or not os.environ.get('CXX'):
+-            os.environ["CXX"] = "g++-4.0"
+-            os.environ["CC"]  = "gcc-4.0"
+-            os.environ["CPP"] = "cpp-4.0"
++        cflags.append("-isysroot")
++        cflags.append("@developer_dir@/SDKs/MacOSX10.6.sdk")
+ 
+     else:
+         # Set flags for other Unix type platforms
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/4a7b2c7b/attachment.html>