Changeset 112294


Ignore:
Timestamp:
Oct 17, 2013, 3:36:13 AM (6 years ago)
Author:
ryandesign@…
Message:

libQGLViewer, libPyQGLViewer: use -arch flags for non-universal builds too, and simplify how it's done

Location:
trunk/dports/graphics
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/libPyQGLViewer/Portfile

    r112293 r112294  
    4141}
    4242
    43 variant universal {}
    44 
    4543post-patch {
    4644    reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
    4745
    48     if {[variant_isset universal]} {
    49         file copy ${filespath}/universal.sh ${worksrcpath}
    50         reinplace "s|@@@WRKSRCPATH@@@|${worksrcpath}|" ${worksrcpath}/universal.sh
    51         reinplace "s|@@@ARCHS@@@|${configure.universal_cxxflags}|" ${worksrcpath}/universal.sh
    52         system "chmod +x ${worksrcpath}/universal.sh && ${worksrcpath}/universal.sh"
    53     }
     46    system -W ${worksrcpath} "sh ${filespath}/archflags.sh [get_canonical_archflags]"
    5447}
    5548
  • trunk/dports/graphics/libPyQGLViewer/files/archflags.sh

    r112291 r112294  
    11#!/bin/sh
    2 for file in `find @@@WRKSRCPATH@@@ -name '*.pro'`; do
     2for file in `find . -name '*.pro'`; do
    33        cat << EOT > ${file}.tmp
    4 QMAKE_CFLAGS_RELEASE += @@@ARCHS@@@
    5 QMAKE_CXXFLAGS_RELEASE += @@@ARCHS@@@
    6 QMAKE_LFLAGS_RELEASE += @@@ARCHS@@@
     4QMAKE_CFLAGS_RELEASE += $@
     5QMAKE_CXXFLAGS_RELEASE += $@
     6QMAKE_LFLAGS_RELEASE += $@
    77EOT
    88        cat ${file} >> ${file}.tmp
  • trunk/dports/graphics/libQGLViewer/Portfile

    r112293 r112294  
    4141}
    4242
    43 variant universal {}
    44 
    4543post-patch {
    4644    reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
    4745
    48     if {[variant_isset universal]} {
    49         file copy ${filespath}/universal.sh ${worksrcpath}
    50         reinplace "s|@@@WRKSRCPATH@@@|${worksrcpath}|" ${worksrcpath}/universal.sh
    51         reinplace "s|@@@ARCHS@@@|${configure.universal_cxxflags}|" ${worksrcpath}/universal.sh
    52         system "chmod +x ${worksrcpath}/universal.sh && ${worksrcpath}/universal.sh"
    53     }
     46    system -W ${worksrcpath} "sh ${filespath}/archflags.sh [get_canonical_archflags]"
    5447}
    5548
  • trunk/dports/graphics/libQGLViewer/files/archflags.sh

    r112290 r112294  
    11#!/bin/sh
    2 for file in `find @@@WRKSRCPATH@@@ -name '*.pro'`; do
     2for file in `find . -name '*.pro'`; do
    33        cat << EOT > ${file}.tmp
    4 QMAKE_CFLAGS_RELEASE += @@@ARCHS@@@
    5 QMAKE_CXXFLAGS_RELEASE += @@@ARCHS@@@
    6 QMAKE_LFLAGS_RELEASE += @@@ARCHS@@@
     4QMAKE_CFLAGS_RELEASE += $@
     5QMAKE_CXXFLAGS_RELEASE += $@
     6QMAKE_LFLAGS_RELEASE += $@
    77EOT
    88        cat ${file} >> ${file}.tmp
Note: See TracChangeset for help on using the changeset viewer.