Changeset 69799


Ignore:
Timestamp:
Jul 16, 2010, 8:20:37 PM (7 years ago)
Author:
michaelld@…
Message:

Move to using pre-compiled headers & optimized qmake; should speed up
compiling Qt as well as ports that depend on qmake. Remove trailing
'/' from SDK paths since that seems confuse up qmake. Move any SQL
extensions from being in the Qt libraries into separate plugins.
Corrected comment on fixing .pc (etc) files. No revision bump since
these changes do not require it.

File:
1 edited

Legend:

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

    r69741 r69799  
    107107    -openssl-linked                                       \
    108108    -dbus-linked                                          \
     109    -pch                                                  \
    109110    -fast                                                 \
     111    -optimized-qmake                                      \
    110112    -arch            \"${build_arch}\"
    111113
     
    156158    lunshift library_path ${prefix}/lib/mysql5/mysql
    157159    configure.args-delete -no-sql-mysql
     160    configure.args-append -plugin-sql-mysql
    158161}
    159162
     
    161164    depends_lib-append port:libiodbc
    162165    configure.args-delete -no-sql-odbc
     166    configure.args-append -plugin-sql-odbc
    163167}
    164168
     
    168172    lunshift library_path ${prefix}/lib/postgresql83
    169173    configure.args-delete -no-sql-psql
     174    configure.args-append -plugin-sql-psql
    170175}
    171176
     
    173178    depends_lib-append port:sqlite2
    174179    configure.args-delete -no-sql-sqlite2
     180    configure.args-append -plugin-sql-sqlite2
    175181}
    176182
     
    219225    if {![variant_isset universal] || ![info exists universal_sysroot]} {
    220226        if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
    221             configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
     227            configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk
    222228        } else {
    223229            ui_msg "No SDK found in Developer/SDKs ; \
     
    233239    if {![variant_isset universal] || ![info exists universal_sysroot]} {
    234240        if {[file exists /Developer/SDKs/MacOSX10.6.sdk]} {
    235             configure.args-append -sdk /Developer/SDKs/MacOSX10.6.sdk/
     241            configure.args-append -sdk /Developer/SDKs/MacOSX10.6.sdk
    236242        } else {
    237243            ui_msg "No SDK found in /Developer/SDKs ; \
     
    258264    set destroot_qt ${destroot}${qt_dir}
    259265
    260     # Fix .pc and .prl files by changing ${destroot}/lib to ${qt_dir}/lib
     266    # Fix .pc and .prl files by changing ${worksrcpath}/lib to ${qt_dir}/lib
    261267    foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/* ${qt_dir}/lib/*.prl ${qt_dir}/lib/*/*.prl ${qt_dir}/share/${dirname}/demos/shared/*.prl] {
    262         reinplace  \
    263             "s|${worksrcpath}/lib|${qt_dir}/lib|g" \
    264             ${fixfile}
     268        reinplace "s|${worksrcpath}/lib|${qt_dir}/lib|g" ${fixfile}
    265269    }
    266270
Note: See TracChangeset for help on using the changeset viewer.