Changeset 98249 for trunk/dports/aqua


Ignore:
Timestamp:
Oct 1, 2012, 12:45:56 AM (7 years ago)
Author:
ryandesign@…
Message:

TOra: change no_oracle variant into oracle variant; build 32-bit on Lion and up when oracle variant is selected to avoid crash (#36260)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/TOra/Portfile

    r73309 r98249  
    77name                    TOra
    88version                 2.1.3
    9 revision                2
     9revision                3
    1010description             GUI tool for Oracle, PostgreSQL, and MySQL
    1111long_description        Database developer/DBA frontend for various DB servers.
     
    2626# It's dangerous to mix library versions in one binary. It's required
    2727# to spot qt4-mac's dependencies' version bumps.
    28 depends_lib             port:qscintilla \
    29                         port:oracle-instantclient
     28depends_lib             port:qscintilla
    3029
    3130patchfiles              patch-osx_tools-Info.plist.in.diff
     
    3837                        -DUSE_PCH=0 \
    3938                        -Dmacports_prefix=${prefix} \
    40                         -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
    41                         -DORACLE_PATH_LIB=${prefix}/lib/oracle \
    4239                        -DWANT_BUNDLE=1 \
    4340                        -DWANT_BUNDLE_STANDALONE=0 \
     
    4542                        -DWANT_INTERNAL_QSCINTILLA=0 \
    4643                        -DENABLE_DB2=0 \
     44                        -DENABLE_ORACLE=0 \
    4745                        ${qt_cmake_defines} .
    4846
     
    8684#
    8785# Oracle
    88 variant no_oracle description {Disable support for Oracle} {
    89     depends_lib-delete          port:oracle-instantclient
    90     configure.pre_args-append   -DENABLE_ORACLE=0
     86variant no_oracle conflicts oracle description {Legacy compatibility variant} {}
     87variant oracle conflicts no_oracle description {Enable support for Oracle} {
     88    depends_lib-append          port:oracle-instantclient
     89    configure.args-delete       -DENABLE_ORACLE=0
     90    configure.args-append       -DENABLE_ORACLE=1 \
     91                                -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
     92                                -DORACLE_PATH_LIB=${prefix}/lib/oracle \
     93}
     94if {[variant_isset no_oracle]} {
     95    default_variants -oracle
     96} else {
     97    default_variants +oracle
     98}
     99if {[variant_isset oracle] && ${os.platform} == "darwin" && ${os.major} > 10} {
     100    # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up.
     101    supported_archs i386
    91102}
    92103
Note: See TracChangeset for help on using the changeset viewer.