Changeset 97960

Timestamp:

Sep 21, 2012, 1:14:18 AM (12 years ago)

Author:

michaelld@…

Message:

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

File:

• trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile (modified) (4 diffs)

trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile

@@ -21 +21 @@
 master_sites        trolltech
 distname            qt-everywhere-opensource-src-${version}
-
 
 checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
@@ -56 +55 @@
     lappend mp.names "qt4-mac-${mp.port}-plugin"
 }
+
 foreach mp.name ${mp.names} {
 
@@ -68 +68 @@
         conflicts-append    ${mp.conflicts}
         depends_lib-append  port:${mp.port}
-        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
-                            LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
-                            mysql.pro
+        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
+                            LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
+        configure.post_args mysql.pro
+
+        variant debug description {Build both release and debug plugin} {}
+
+        pre-configure {
+            configure.args-append CONFIG+=\"${qt_arch_types}\"
+        }
+
+        post-patch {
+            if {![variant_isset debug]} {
+                reinplace "s@debug_and_release@release@" \
+                    ${worksrcpath}/src/plugins/qpluginbase.pri
+            }
+        }
+
     } else {
 
@@ -79 +93 @@
             conflicts-append    ${mp.conflicts}
             depends_lib-append  port:${mp.port}
-            configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
-                                LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
-                                mysql.pro
+            configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
+                                LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
+            configure.post_args mysql.pro
+
+            variant debug description \
+                {Build both release and debug plugin} {}
+
+            pre-configure {
+                configure.args-append CONFIG+=\"${qt_arch_types}\"
+            }
+
+            post-patch {
+                if {![variant_isset debug]} {
+                    reinplace "s@debug_and_release@release@" \
+                        ${worksrcpath}/src/plugins/qpluginbase.pri
+                }
+            }
         }
-    
     }
 }