Merge pull request #1 from aszlig/php-from-sys

sys: Use includes from php-config --include-dir

ivory/sys/build.rs

@@ -53,8 +53,76 @@ fn exists(path: &str) -> bool {
     Path::new(target(path).as_str()).exists()
 }
 
-fn main() {
+fn compile_php(php_version: &str, link_static: bool) -> () {
+    println_stderr!("Setting up PHP {}", php_version);
+    run_command_or_fail("/".to_string(), "mkdir", &["-p", &target("")]);
+    run_command_or_fail(
+        target(""),
+        "git",
+        &[
+            "clone",
+            "https://github.com/php/php-src",
+            format!("--branch={}", php_version).as_str(),
+        ],
+    );
+    run_command_or_fail(
+        target("php-src"),
+        "sed",
+        &[
+            "-e",
+            "s/void zend_signal_startup/ZEND_API void zend_signal_startup/g",
+            "-ibk",
+            "Zend/zend_signal.c",
+            "Zend/zend_signal.h",
+        ],
+    );
+    run_command_or_fail(target("php-src"), "./genfiles", &[]);
+    run_command_or_fail(target("php-src"), "./buildconf", &["--force"]);
+
+    let embed_type = if link_static { "static" } else { "shared" };
+
+    #[cfg(all(target_os = "linux"))]
+    let config = &[
+        "--enable-debug",
+        &format!("--enable-embed={}", embed_type),
+        "--disable-cli",
+        "--disable-cgi",
+        "--enable-maintainer-zts",
+        // "--without-iconv",
+        "--disable-libxml",
+        "--disable-dom",
+        "--disable-xml",
+        "--disable-simplexml",
+        "--disable-xmlwriter",
+        "--disable-xmlreader",
+        // "--without-pear",
+        // "--with-libdir=lib64",
+        // "--with-pic",
+    ];
+    #[cfg(all(target_os = "macos"))]
+    let config = &[
+        "--enable-debug",
+        &format!("--enable-embed={}", embed_type),
+        "--disable-cli",
+        "--disable-cgi",
+        "--enable-maintainer-zts",
+        "--without-iconv",
+        "--disable-libxml",
+        "--disable-dom",
+        "--disable-xml",
+        "--disable-simplexml",
+        "--disable-xmlwriter",
+        "--disable-xmlreader",
+        // "--without-pear",
+        // "--with-libdir=lib64",
+        // "--with-pic",
+    ];
+    run_command_or_fail(target("php-src"), "./configure", config);
     let cpus = format!("{}", num_cpus::get());
+    run_command_or_fail(target("php-src"), "make", &["-j", cpus.as_str()]);
+}
+
+fn main() {
     #[cfg(all(target_os = "linux"))]
     let default_link_static = false;
     #[cfg(all(target_os = "macos"))]
@@ -71,75 +139,18 @@ fn main() {
         .map(|_| true)
         .unwrap_or(default_link_static && !link_dynamic);
 
-    if !exists("php-src/LICENSE") {
+    let maybe_include_dir = Command::new("php-config")
-        println_stderr!("Setting up PHP {}", php_version);
+        .args(&["--include-dir"])
-        run_command_or_fail("/".to_string(), "mkdir", &["-p", &target("")]);
+        .output()
-        run_command_or_fail(
+        .map(|o| String::from_utf8(o.stdout).unwrap().trim_end().to_string())
-            target(""),
+        .ok();
-            "git",
-            &[
-                "clone",
-                "https://github.com/php/php-src",
-                format!("--branch={}", php_version).as_str(),
-            ],
-        );
-        run_command_or_fail(
-            target("php-src"),
-            "sed",
-            &[
-                "-e",
-                "s/void zend_signal_startup/ZEND_API void zend_signal_startup/g",
-                "-ibk",
-                "Zend/zend_signal.c",
-                "Zend/zend_signal.h",
-            ],
-        );
-        run_command_or_fail(target("php-src"), "./genfiles", &[]);
-        run_command_or_fail(target("php-src"), "./buildconf", &["--force"]);
 
-        let embed_type = if link_static { "static" } else { "shared" };
+    let include_dir = maybe_include_dir.unwrap_or_else(|| {
-
+        if !exists("php-src/LICENSE") {
-        #[cfg(all(target_os = "linux"))]
+            compile_php(php_version, link_static);
-        let config = &[
+        }
-            "--enable-debug",
+        target("php-src")
-            &format!("--enable-embed={}", embed_type),
+    });
-            "--disable-cli",
-            "--disable-cgi",
-            "--enable-maintainer-zts",
-            // "--without-iconv",
-            "--disable-libxml",
-            "--disable-dom",
-            "--disable-xml",
-            "--disable-simplexml",
-            "--disable-xmlwriter",
-            "--disable-xmlreader",
-            // "--without-pear",
-            // "--with-libdir=lib64",
-            // "--with-pic",
-        ];
-        #[cfg(all(target_os = "macos"))]
-        let config = &[
-            "--enable-debug",
-            &format!("--enable-embed={}", embed_type),
-            "--disable-cli",
-            "--disable-cgi",
-            "--enable-maintainer-zts",
-            "--without-iconv",
-            "--disable-libxml",
-            "--disable-dom",
-            "--disable-xml",
-            "--disable-simplexml",
-            "--disable-xmlwriter",
-            "--disable-xmlreader",
-            // "--without-pear",
-            // "--with-libdir=lib64",
-            // "--with-pic",
-        ];
-        run_command_or_fail(target("php-src"), "./configure", config);
-        run_command_or_fail(target("php-src"), "make", &["-j", cpus.as_str()]);
-    }
-
-    let include_dir = target("php-src");
 
     let includes = ["/", "/TSRM", "/Zend", "/main"]
         .iter()

ivory/sys/wrapper.h

@@ -1,5 +1,9 @@
 #ifndef PHP_RS_WRAPPER_H
 #define PHP_RS_WRAPPER_H
+/* CLang doesn't support asm goto yet, so let's force-disable it. */
+#include <main/php_config.h>
+#undef HAVE_ASM_GOTO
+
 #include <Zend/zend.h>
 #include <Zend/zend_compile.h>
 #include <main/php.h>