[98249] trunk/dports/aqua/TOra/Portfile
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 30 17:45:56 PDT 2012
Revision: 98249
http://trac.macports.org//changeset/98249
Author: ryandesign at macports.org
Date: 2012-09-30 17:45:56 -0700 (Sun, 30 Sep 2012)
Log 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)
Modified Paths:
--------------
trunk/dports/aqua/TOra/Portfile
Modified: trunk/dports/aqua/TOra/Portfile
===================================================================
--- trunk/dports/aqua/TOra/Portfile 2012-10-01 00:34:10 UTC (rev 98248)
+++ trunk/dports/aqua/TOra/Portfile 2012-10-01 00:45:56 UTC (rev 98249)
@@ -6,7 +6,7 @@
name TOra
version 2.1.3
-revision 2
+revision 3
description GUI tool for Oracle, PostgreSQL, and MySQL
long_description Database developer/DBA frontend for various DB servers.
maintainers scribus.info:petr
@@ -25,8 +25,7 @@
# WARNING: postgresql83 is there due to qt4-mac's dependency on it.
# It's dangerous to mix library versions in one binary. It's required
# to spot qt4-mac's dependencies' version bumps.
-depends_lib port:qscintilla \
- port:oracle-instantclient
+depends_lib port:qscintilla
patchfiles patch-osx_tools-Info.plist.in.diff
@@ -37,13 +36,12 @@
-DCMAKE_INCLUDE_PATH=${prefix}/include \
-DUSE_PCH=0 \
-Dmacports_prefix=${prefix} \
- -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
- -DORACLE_PATH_LIB=${prefix}/lib/oracle \
-DWANT_BUNDLE=1 \
-DWANT_BUNDLE_STANDALONE=0 \
-DWANT_RPM=0 \
-DWANT_INTERNAL_QSCINTILLA=0 \
-DENABLE_DB2=0 \
+ -DENABLE_ORACLE=0 \
${qt_cmake_defines} .
@@ -85,10 +83,23 @@
#
# Oracle
-variant no_oracle description {Disable support for Oracle} {
- depends_lib-delete port:oracle-instantclient
- configure.pre_args-append -DENABLE_ORACLE=0
+variant no_oracle conflicts oracle description {Legacy compatibility variant} {}
+variant oracle conflicts no_oracle description {Enable support for Oracle} {
+ depends_lib-append port:oracle-instantclient
+ configure.args-delete -DENABLE_ORACLE=0
+ configure.args-append -DENABLE_ORACLE=1 \
+ -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
+ -DORACLE_PATH_LIB=${prefix}/lib/oracle \
}
+if {[variant_isset no_oracle]} {
+ default_variants -oracle
+} else {
+ default_variants +oracle
+}
+if {[variant_isset oracle] && ${os.platform} == "darwin" && ${os.major} > 10} {
+ # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up.
+ supported_archs i386
+}
#
# Debug
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120930/5146d5d7/attachment.html>
More information about the macports-changes
mailing list