[88758] trunk/dports/graphics/MyPaint

[ryandesign at macports.org]

Revision: 88758
          http://trac.macports.org/changeset/88758
Author:   ryandesign at macports.org
Date:     2012-01-10 13:16:08 -0800 (Tue, 10 Jan 2012)
Log Message:
-----------
MyPaint: ensure we're UsingTheRightCompiler and architectures; add universal variant; see #32251

Modified Paths:
--------------
    trunk/dports/graphics/MyPaint/Portfile
    trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff

Modified: trunk/dports/graphics/MyPaint/Portfile
===================================================================
--- trunk/dports/graphics/MyPaint/Portfile	2012-01-10 20:32:08 UTC (rev 88757)
+++ trunk/dports/graphics/MyPaint/Portfile	2012-01-10 21:16:08 UTC (rev 88758)
@@ -48,11 +48,15 @@
 
 use_configure               no
 
+variant universal {}
+
 build.cmd                   scons
 build.target
 build.args                  prefix=${prefix}
+build.env                   CXX="${configure.cxx} [get_canonical_archflags]"
 
 destroot.destdir            prefix=${destroot}${prefix}
+destroot.env                CXX="${configure.cxx} [get_canonical_archflags]"
 
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff	2012-01-10 20:32:08 UTC (rev 88757)
+++ trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff	2012-01-10 21:16:08 UTC (rev 88758)
@@ -1,5 +1,5 @@
 --- SConstruct.orig	2011-11-22 14:27:03.000000000 -0600
-+++ SConstruct	2012-01-10 14:07:43.000000000 -0600
++++ SConstruct	2012-01-10 14:31:34.000000000 -0600
 @@ -21,10 +21,7 @@
  
  SConsignFile() # no .scsonsign into $PREFIX please
@@ -12,7 +12,15 @@
  
  opts = Variables()
  opts.Add(PathVariable('prefix', 'autotools-style installation prefix', default_prefix, validator=PathVariable.PathIsDirCreate))
-@@ -52,8 +49,15 @@
+@@ -45,6 +42,7 @@
+ numpy_path = numpy.get_include()
+ env.Append(CPPPATH=numpy_path)
+ 
++env['CXX'] = os.environ.get('CXX', 'g++')
+ 
+ if sys.platform == "win32":
+     # official python shipped with no pc file on windows so get from current python
+@@ -52,8 +50,15 @@
      pre,inc = sysconfig.get_config_vars('exec_prefix', 'INCLUDEPY')
      env.Append(CPPPATH=inc, LIBPATH=pre+'\libs', LIBS='python'+sys.version[0]+sys.version[2])
  elif sys.platform == "darwin":
@@ -30,7 +38,7 @@
  else:
      # some distros use python2.5-config, others python-config2.5
      try:
-@@ -81,7 +85,7 @@
+@@ -81,7 +86,7 @@
  
  def burn_python_version(target, source, env):
      # make sure we run the python version that we built the extension modules for
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120110/92dfcf3e/attachment-0001.html>