[116759] trunk/dports/lang/php/Portfile

[ryandesign at macports.org]

Revision: 116759
          https://trac.macports.org/changeset/116759
Author:   ryandesign at macports.org
Date:     2014-02-05 22:47:23 -0800 (Wed, 05 Feb 2014)
Log Message:
-----------
php: revert r116757; the only reason that worked on my system was that it was opportunistically finding headers installed by the old php5 port

Revision Links:
--------------
    https://trac.macports.org/changeset/116757

Modified Paths:
--------------
    trunk/dports/lang/php/Portfile

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2014-02-06 06:24:34 UTC (rev 116758)
+++ trunk/dports/lang/php/Portfile	2014-02-06 06:47:23 UTC (rev 116759)
@@ -951,13 +951,6 @@
     
     long_description        ${description}
     
-    if {[vercmp ${php.branch} 5.6] == 0} {
-        # https://bugs.php.net/bug.php?id=66604
-        # fatal error: 'pdo/php_pdo_error.h' file not found
-        extract.post_args-append ${worksrcdir}/ext/pdo
-        configure.cppflags-append -I${worksrcpath}/ext
-    }
-    
     variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Use PostgreSQL 8.2 libraries} {
         depends_lib-append      port:postgresql82
         
@@ -1207,6 +1200,16 @@
         php.build_dirs-append ${worksrcpath}/ext/${extension}
     }
     
+    post-extract {
+        # The PDO extensions need the PDO headers which are installed by the ${php} port.
+        foreach extension [concat ${php.extensions} ${php.extensions.zend}] {
+            if {[regexp {^pdo_} ${extension}]} {
+                file mkdir ${worksrcpath}/ext/${extension}/ext
+                ln -s ${prefix}/include/${php}/php/ext/pdo ${worksrcpath}/ext/${extension}/ext
+            }
+        }
+    }
+    
     pre-configure {
         set php_version [exec ${php.config} --version 2>/dev/null]
         if {${version} ne ${php_version}} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140205/2de4d73f/attachment-0001.html>