Revision: 73101
http://trac.macports.org/changeset/73101
Author: michaelld at macports.org
Date: 2010-11-03 18:05:21 -0700 (Wed, 03 Nov 2010)
Log Message:
-----------
Qt4 PortGroup Changes:
* add check for key variable 'building_qt4' to signify that qt4 is
being built, and hence to not include certain parts (e.g.,
depends_lib on qt4-mac, or archcheck on QtCore).
* archcheck QtCore library if not building Qt4.
* if +debug variant exists and is set, and not building Qt4, then
verify that QtCore_debug library exists and error out if not.
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2010-11-04 01:03:28 UTC (rev 73100)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2010-11-04 01:05:21 UTC (rev 73101)
@@ -35,6 +35,30 @@
# Usage:
# PortGroup qt4 1.0
+# always archcheck QtCore
+PortGroup archcheck 1.0
+
+# check arch of libraries on which this port depends
+if {![info exists building_qt4]} {
+ archcheck.files-append lib/libQtCore.dylib
+}
+
+# check for +debug variant of this port, and make sure Qt was
+# installed with +debug as well; if not, error out.
+platform darwin {
+ pre-extract {
+ if {[variant_exists debug] && \
+ [variant_isset debug] && \
+ ![info exists building_qt4]} {
+ if {![file exists ${prefix}/lib/libQtCore_debug.dylib]} {
+ return -code error "\n\nERROR:\n\
+In order to install this port as +debug,
+Qt4 must also be installed with +debug.\n"
+ }
+ }
+ }
+}
+
# standard Qt4 name
global qt_name
set qt_name qt4
@@ -73,7 +97,7 @@
# standard Qt .app executables directory, if created
global qt_apps_dir
-set qt_apps_dir ${applications_dir}/Qt
+set qt_apps_dir ${applications_dir}/Qt4
# standard Qt data directory
global qt_data_dir
@@ -129,7 +153,9 @@
default qt_arch_types {[string map {i386 x86} [get_canonical_archs]]}
# allow for both qt4 and qt4 devel
-depends_lib-append path:bin/qmake:qt4-mac
+if {![info exists building_qt4]} {
+ depends_lib-append path:bin/qmake:qt4-mac
+}
# standard configure environment
configure.env-append QTDIR=${qt_dir} \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101103/96aad11c/attachment.html>