Build 1.35.0

Author: tuxillo

1.35.0/build.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+RUSTC_BOOTSTRAP_VERSION=1.34.2
+CARGO_BOOTSTRAP_VERSION=0.35.0
+RUST_VERSION=1.35.0
+
+CONFIGURE_CARGO_STATIC_FLAGS="--enable-cargo-native-static"
+
+# XXX: miri does not build correctly that's why we need the flag below.
+ADDITIONAL_CONFIGURE_FLAGS="--enable-missing-tools"
+
+BASE=`pwd`
+DEST=$1
+LLVM_ROOT=""
+
+. ../checksums.sh
+. ../common.sh
+
+fixup-vendor() {
+        fixup-vendor-patch openssl-src src/lib.rs || exit 1
+}
+
+RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1

1.35.0/patches/patch-cmake_modules_HandleLLVMOptions.cmake

@@ -0,0 +1,10 @@
+--- src/llvm-project/llvm/cmake/modules/HandleLLVMOptions.cmake.orig	2018-03-10 02:51:13 UTC
++++ src/llvm-project/llvm/cmake/modules/HandleLLVMOptions.cmake
+@@ -146,6 +146,7 @@ endif()
+ # build might work on ELF but fail on MachO/COFF.
+ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
+         ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
++        ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" OR
+         ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND
+    NOT LLVM_USE_SANITIZER)
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")

1.35.0/patches/patch-src_llvm_lib_Support_Unix_Path.inc

@@ -0,0 +1,18 @@
+--- src/llvm-project/llvm/lib/Support/Unix/Path.inc.orig	2018-04-04 15:39:54 UTC
++++ src/llvm-project/llvm/lib/Support/Unix/Path.inc
+@@ -68,13 +68,13 @@
+ 
+ #include <sys/types.h>
+ #if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) &&   \
+-    !defined(__linux__)
++    !defined(__DragonFly__) && !defined(__linux__)
+ #include <sys/statvfs.h>
+ #define STATVFS statvfs
+ #define FSTATVFS fstatvfs
+ #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
+ #else
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #elif defined(__linux__)

1.35.0/patches/patch-src_vendor_openssl-src_src_lib.rs

@@ -0,0 +1,47 @@
+--- vendor/openssl-src/src/lib.rs.orig	2018-12-08 18:57:16 UTC
++++ vendor/openssl-src/src/lib.rs
+@@ -51,6 +51,13 @@ impl Build {
+         self
+     }
+ 
++    fn cmd_make(&self) -> Command {
++        match &self.host.as_ref().expect("HOST dir not set")[..] {
++            "x86_64-unknown-dragonfly" => Command::new("gmake"),
++            _ => Command::new("make"),
++        }
++    }
++
+     pub fn build(&mut self) -> Artifacts {
+         let target = &self.target.as_ref().expect("TARGET dir not set")[..];
+         let host = &self.host.as_ref().expect("HOST dir not set")[..];
+@@ -161,6 +168,7 @@ impl Build {
+             "x86_64-pc-windows-gnu" => "mingw64",
+             "x86_64-pc-windows-msvc" => "VC-WIN64A",
+             "x86_64-unknown-freebsd" => "BSD-x86_64",
++            "x86_64-unknown-dragonfly" => "BSD-x86_64",
+             "x86_64-unknown-linux-gnu" => "linux-x86_64",
+             "x86_64-unknown-linux-musl" => "linux-x86_64",
+             "x86_64-unknown-netbsd" => "BSD-x86_64",
+@@ -264,11 +272,11 @@ impl Build {
+             install.arg("install_sw").current_dir(&inner_dir);
+             self.run_command(install, "installing OpenSSL");
+         } else {
+-            let mut depend = Command::new("make");
++            let mut depend = self.cmd_make();
+             depend.arg("depend").current_dir(&inner_dir);
+             self.run_command(depend, "building OpenSSL dependencies");
+ 
+-            let mut build = Command::new("make");
++            let mut build = self.cmd_make();
+             build.current_dir(&inner_dir);
+             if !cfg!(windows) {
+                 if let Some(s) = env::var_os("CARGO_MAKEFLAGS") {
+@@ -277,7 +285,7 @@ impl Build {
+             }
+             self.run_command(build, "building OpenSSL");
+ 
+-            let mut install = Command::new("make");
++            let mut install = self.cmd_make();
+             install.arg("install_sw").current_dir(&inner_dir);
+             self.run_command(install, "installing OpenSSL");
+         }