Changeset 97960


Ignore:
Timestamp:
Sep 21, 2012, 1:14:18 AM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac-mysql55-plugin : fix +debug and +universal variants. Addresses ticket #35827.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile

    r97953 r97960  
    2121master_sites        trolltech
    2222distname            qt-everywhere-opensource-src-${version}
    23 
    2423
    2524checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
     
    5655    lappend mp.names "qt4-mac-${mp.port}-plugin"
    5756}
     57
    5858foreach mp.name ${mp.names} {
    5959
     
    6868        conflicts-append    ${mp.conflicts}
    6969        depends_lib-append  port:${mp.port}
    70         configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
    71                             LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
    72                             mysql.pro
     70        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
     71                            LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
     72        configure.post_args mysql.pro
     73
     74        variant debug description {Build both release and debug plugin} {}
     75
     76        pre-configure {
     77            configure.args-append CONFIG+=\"${qt_arch_types}\"
     78        }
     79
     80        post-patch {
     81            if {![variant_isset debug]} {
     82                reinplace "s@debug_and_release@release@" \
     83                    ${worksrcpath}/src/plugins/qpluginbase.pri
     84            }
     85        }
     86
    7387    } else {
    7488
     
    7993            conflicts-append    ${mp.conflicts}
    8094            depends_lib-append  port:${mp.port}
    81             configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
    82                                 LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
    83                                 mysql.pro
     95            configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
     96                                LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
     97            configure.post_args mysql.pro
     98
     99            variant debug description \
     100                {Build both release and debug plugin} {}
     101
     102            pre-configure {
     103                configure.args-append CONFIG+=\"${qt_arch_types}\"
     104            }
     105
     106            post-patch {
     107                if {![variant_isset debug]} {
     108                    reinplace "s@debug_and_release@release@" \
     109                        ${worksrcpath}/src/plugins/qpluginbase.pri
     110                }
     111            }
    84112        }
    85    
    86113    }
    87114}
Note: See TracChangeset for help on using the changeset viewer.