[68863] trunk/dports/devel/opal

[snc at macports.org]

Revision: 68863
          http://trac.macports.org/changeset/68863
Author:   snc at macports.org
Date:     2010-06-16 05:48:48 -0700 (Wed, 16 Jun 2010)
Log Message:
-----------
Now UsingTheRightCompiler the Right Way?\226?\132?\162, #20770

Modified Paths:
--------------
    trunk/dports/devel/opal/Portfile

Added Paths:
-----------
    trunk/dports/devel/opal/files/patch-SConstruct.diff

Removed Paths:
-------------
    trunk/dports/devel/opal/files/patch-src-SConstruct.diff

Modified: trunk/dports/devel/opal/Portfile
===================================================================
--- trunk/dports/devel/opal/Portfile	2010-06-16 12:08:07 UTC (rev 68862)
+++ trunk/dports/devel/opal/Portfile	2010-06-16 12:48:48 UTC (rev 68863)
@@ -29,12 +29,11 @@
                     sha1    550359a1fb1f75f5e343d123383cbc659136dabd \
                     rmd160  e9a1ab4a08198aeebfe5784868a2ae68b0b145fc
 
-platform darwin {
-    # Build libopal-ode.dylib properly
-    patchfiles-append patch-src-SConstruct.diff
-    post-patch {
-        reinplace "s|@prefix@|${prefix}|" ${worksrcpath}/SConstruct
-    }
+patchfiles-append patch-SConstruct.diff
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/SConstruct
+    reinplace "s|@CXX@|${configure.cxx}|" ${worksrcpath}/SConstruct
+    reinplace "s|@CXXFLAGS@|${configure.cxxflags}|" ${worksrcpath}/SConstruct
 }
 
 use_configure       no

Copied: trunk/dports/devel/opal/files/patch-SConstruct.diff (from rev 68862, trunk/dports/devel/opal/files/patch-src-SConstruct.diff)
===================================================================
--- trunk/dports/devel/opal/files/patch-SConstruct.diff	                        (rev 0)
+++ trunk/dports/devel/opal/files/patch-SConstruct.diff	2010-06-16 12:48:48 UTC (rev 68863)
@@ -0,0 +1,11 @@
+--- SConstruct.orig	2010-06-16 08:42:43.000000000 -0400
++++ SConstruct	2010-06-16 08:45:14.000000000 -0400
+@@ -155,3 +155,8 @@
+ 
+ # Add lib installation to 'install' alias
+ env.Alias('install', env.Install(os.path.join(env['prefix'], 'lib'), opalLib))
++
++# Link properly on OS X
++env.Append(SHLINKFLAGS = '-dynamiclib -install_name "@PREFIX@/lib/libopal-ode.dylib"')
++env['CXX'] = '@CXX@'
++env['CXXFLAGS'] = '@CXXFLAGS@'

Deleted: trunk/dports/devel/opal/files/patch-src-SConstruct.diff
===================================================================
--- trunk/dports/devel/opal/files/patch-src-SConstruct.diff	2010-06-16 12:08:07 UTC (rev 68862)
+++ trunk/dports/devel/opal/files/patch-src-SConstruct.diff	2010-06-16 12:48:48 UTC (rev 68863)
@@ -1,9 +0,0 @@
---- SConstruct.orig	2009-08-18 13:16:33.000000000 +0200
-+++ SConstruct	2009-08-18 13:19:22.000000000 +0200
-@@ -155,3 +155,6 @@
- 
- # Add lib installation to 'install' alias
- env.Alias('install', env.Install(os.path.join(env['prefix'], 'lib'), opalLib))
-+
-+# Link properly on OS X
-+env.Append(SHLINKFLAGS = '-dynamiclib -install_name "@prefix@/lib/libopal-ode.dylib"')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100616/5df16c94/attachment.html>