[112294] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 112294
          https://trac.macports.org/changeset/112294
Author:   ryandesign at macports.org
Date:     2013-10-16 20:36:13 -0700 (Wed, 16 Oct 2013)
Log Message:
-----------
libQGLViewer, libPyQGLViewer: use -arch flags for non-universal builds too, and simplify how it's done

Modified Paths:
--------------
    trunk/dports/graphics/libPyQGLViewer/Portfile
    trunk/dports/graphics/libQGLViewer/Portfile

Added Paths:
-----------
    trunk/dports/graphics/libPyQGLViewer/files/archflags.sh
    trunk/dports/graphics/libQGLViewer/files/archflags.sh

Removed Paths:
-------------
    trunk/dports/graphics/libPyQGLViewer/files/universal.sh
    trunk/dports/graphics/libQGLViewer/files/universal.sh

Modified: trunk/dports/graphics/libPyQGLViewer/Portfile
===================================================================
--- trunk/dports/graphics/libPyQGLViewer/Portfile	2013-10-17 03:13:51 UTC (rev 112293)
+++ trunk/dports/graphics/libPyQGLViewer/Portfile	2013-10-17 03:36:13 UTC (rev 112294)
@@ -40,17 +40,10 @@
     patchfiles-append           patch-contribs.pro.diff
 }
 
-variant universal {}
-
 post-patch {
     reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
 
-    if {[variant_isset universal]} {
-        file copy ${filespath}/universal.sh ${worksrcpath}
-        reinplace "s|@@@WRKSRCPATH@@@|${worksrcpath}|" ${worksrcpath}/universal.sh
-        reinplace "s|@@@ARCHS@@@|${configure.universal_cxxflags}|" ${worksrcpath}/universal.sh
-        system "chmod +x ${worksrcpath}/universal.sh && ${worksrcpath}/universal.sh"
-    }
+    system -W ${worksrcpath} "sh ${filespath}/archflags.sh [get_canonical_archflags]"
 }
 
 configure.pre_args-append       DOC_DIR=${prefix}/share/doc/${name}

Copied: trunk/dports/graphics/libPyQGLViewer/files/archflags.sh (from rev 112291, trunk/dports/graphics/libPyQGLViewer/files/universal.sh)
===================================================================
--- trunk/dports/graphics/libPyQGLViewer/files/archflags.sh	                        (rev 0)
+++ trunk/dports/graphics/libPyQGLViewer/files/archflags.sh	2013-10-17 03:36:13 UTC (rev 112294)
@@ -0,0 +1,10 @@
+#!/bin/sh
+for file in `find . -name '*.pro'`; do
+	cat << EOT > ${file}.tmp
+QMAKE_CFLAGS_RELEASE += $@
+QMAKE_CXXFLAGS_RELEASE += $@
+QMAKE_LFLAGS_RELEASE += $@
+EOT
+	cat ${file} >> ${file}.tmp
+	mv ${file}.tmp ${file}
+done

Deleted: trunk/dports/graphics/libPyQGLViewer/files/universal.sh
===================================================================
--- trunk/dports/graphics/libPyQGLViewer/files/universal.sh	2013-10-17 03:13:51 UTC (rev 112293)
+++ trunk/dports/graphics/libPyQGLViewer/files/universal.sh	2013-10-17 03:36:13 UTC (rev 112294)
@@ -1,10 +0,0 @@
-#!/bin/sh
-for file in `find @@@WRKSRCPATH@@@ -name '*.pro'`; do
-	cat << EOT > ${file}.tmp
-QMAKE_CFLAGS_RELEASE += @@@ARCHS@@@
-QMAKE_CXXFLAGS_RELEASE += @@@ARCHS@@@
-QMAKE_LFLAGS_RELEASE += @@@ARCHS@@@
-EOT
-	cat ${file} >> ${file}.tmp
-	mv ${file}.tmp ${file}
-done

Modified: trunk/dports/graphics/libQGLViewer/Portfile
===================================================================
--- trunk/dports/graphics/libQGLViewer/Portfile	2013-10-17 03:13:51 UTC (rev 112293)
+++ trunk/dports/graphics/libQGLViewer/Portfile	2013-10-17 03:36:13 UTC (rev 112294)
@@ -40,17 +40,10 @@
     patchfiles-append           patch-contribs.pro.diff
 }
 
-variant universal {}
-
 post-patch {
     reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
 
-    if {[variant_isset universal]} {
-        file copy ${filespath}/universal.sh ${worksrcpath}
-        reinplace "s|@@@WRKSRCPATH@@@|${worksrcpath}|" ${worksrcpath}/universal.sh
-        reinplace "s|@@@ARCHS@@@|${configure.universal_cxxflags}|" ${worksrcpath}/universal.sh
-        system "chmod +x ${worksrcpath}/universal.sh && ${worksrcpath}/universal.sh"
-    }
+    system -W ${worksrcpath} "sh ${filespath}/archflags.sh [get_canonical_archflags]"
 }
 
 configure.pre_args-append       DOC_DIR=${prefix}/share/doc/${name}

Copied: trunk/dports/graphics/libQGLViewer/files/archflags.sh (from rev 112290, trunk/dports/graphics/libQGLViewer/files/universal.sh)
===================================================================
--- trunk/dports/graphics/libQGLViewer/files/archflags.sh	                        (rev 0)
+++ trunk/dports/graphics/libQGLViewer/files/archflags.sh	2013-10-17 03:36:13 UTC (rev 112294)
@@ -0,0 +1,10 @@
+#!/bin/sh
+for file in `find . -name '*.pro'`; do
+	cat << EOT > ${file}.tmp
+QMAKE_CFLAGS_RELEASE += $@
+QMAKE_CXXFLAGS_RELEASE += $@
+QMAKE_LFLAGS_RELEASE += $@
+EOT
+	cat ${file} >> ${file}.tmp
+	mv ${file}.tmp ${file}
+done

Deleted: trunk/dports/graphics/libQGLViewer/files/universal.sh
===================================================================
--- trunk/dports/graphics/libQGLViewer/files/universal.sh	2013-10-17 03:13:51 UTC (rev 112293)
+++ trunk/dports/graphics/libQGLViewer/files/universal.sh	2013-10-17 03:36:13 UTC (rev 112294)
@@ -1,10 +0,0 @@
-#!/bin/sh
-for file in `find @@@WRKSRCPATH@@@ -name '*.pro'`; do
-	cat << EOT > ${file}.tmp
-QMAKE_CFLAGS_RELEASE += @@@ARCHS@@@
-QMAKE_CXXFLAGS_RELEASE += @@@ARCHS@@@
-QMAKE_LFLAGS_RELEASE += @@@ARCHS@@@
-EOT
-	cat ${file} >> ${file}.tmp
-	mv ${file}.tmp ${file}
-done
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131016/485d1731/attachment.html>