Add some missing files. Get 1.27.0 and 1.28.0 in

Author: mneumann

1.25.0/patches/patch-src_libstd_build.rs

@@ -0,0 +1,18 @@
+--- src/libstd/build.rs.orig	2018-03-25 14:26:14 UTC
++++ src/libstd/build.rs
+@@ -42,9 +42,13 @@ fn main() {
+     } else if target.contains("freebsd") {
+         println!("cargo:rustc-link-lib=execinfo");
+         println!("cargo:rustc-link-lib=pthread");
+-    } else if target.contains("dragonfly") || target.contains("bitrig") ||
+-              target.contains("netbsd") || target.contains("openbsd") {
++    } else if target.contains("bitrig") || target.contains("netbsd") ||
++              target.contains("openbsd") {
+         println!("cargo:rustc-link-lib=pthread");
++    } else if target.contains("dragonfly") {
++        println!("cargo:rustc-link-lib=pthread");
++        println!("cargo:rustc-link-search=native=/usr/lib");
++        println!("cargo:rustc-link-lib=static=execinfo");
+     } else if target.contains("solaris") {
+         println!("cargo:rustc-link-lib=socket");
+         println!("cargo:rustc-link-lib=posix4");

1.27.0/patches/patch-cmake_modules_HandleLLVMOptions.cmake

@@ -0,0 +1,10 @@
+--- src/llvm/cmake/modules/HandleLLVMOptions.cmake.orig	2018-03-10 02:51:13 UTC
++++ src/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.27.0/patches/patch-src_llvm_lib_Support_Unix_Path.inc

@@ -0,0 +1,18 @@
+--- src/llvm/lib/Support/Unix/Path.inc.orig	2018-04-04 15:39:54 UTC
++++ src/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.28.0/build.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Must be set to the directory where a recent rust snapshot can be found.
+#BOOTSTRAP_DIR=
+
+RUSTC_BOOTSTRAP_VERSION=1.27.0
+CARGO_BOOTSTRAP_VERSION=0.28.0
+RUST_VERSION=1.28.0
+
+BASE=`pwd`
+DEST=$1
+LLVM_ROOT=""
+
+. ../checksums.sh
+. ../common.sh
+
+RUN info clean extract prepatch config xbuild xdist inst 2>&1

1.28.0/patches/patch-cmake_modules_HandleLLVMOptions.cmake

@@ -0,0 +1,10 @@
+--- src/llvm/cmake/modules/HandleLLVMOptions.cmake.orig	2018-03-10 02:51:13 UTC
++++ src/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.28.0/patches/patch-src_llvm_lib_Support_Unix_Path.inc

@@ -0,0 +1,18 @@
+--- src/llvm/lib/Support/Unix/Path.inc.orig	2018-04-04 15:39:54 UTC
++++ src/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__)

README.md

@@ -5,6 +5,30 @@ Boostrapping the Rust compiler on DragonFlyBSD (Scripts only, no binaries)
 ## Build dependencies
 
 * devel/llvm50
+* (devel/llvm60)
+* gcc7
 * lang/python27
 * devel/cmake
 * security/libssh
+* perl5 (for shasum)
+
+## Howto build
+
+	# To build rust <= 1.27
+	cd $HOME
+	mkdir rust
+	cd $HOME/rust && git clone https://github.com/mneumann/rust-bootstrap-dragonfly-dist.git
+	export BOOTSTRAP_DIR=$HOME/rust/rust-bootstrap-dragonfly-dist
+
+	cd $HOME/rust && git clone https://github.com/mneumann/rust-bootstrap-dragonfly.git
+	cd $HOME/rust/rust-bootstrap-dragonfly/1.26.0 && ./build.sh $HOME/rust/build-1.26.0
+
+    # To build rust > 1.27
+	cd $HOME
+	mkdir rust
+	# replace 1.27.0 below by the previous version, e.g. for 1.28.0 use 1.27.0
+	cd $HOME/rust && git clone https://github.com/mneumann/rust-dragonfly-dist-1.27.0.git
+	export BOOTSTRAP_DIR=$HOME/rust/rust-dragonfly-dist-1.27.0
+
+	cd $HOME/rust && git clone https://github.com/mneumann/rust-bootstrap-dragonfly.git
+	cd $HOME/rust/rust-bootstrap-dragonfly/1.28.0 && ./build.sh $HOME/rust/build-1.28.0

bin/sha256

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/sha256 $* 

checksums.sh

@@ -8,3 +8,5 @@ SHA256_rustc_1_23_0_src_tar_gz=7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5
 SHA256_rustc_1_24_0_src_tar_gz=bb8276f6044e877e447f29f566e4bbf820fa51fea2f912d59b73233ffd95639f
 SHA256_rustc_1_25_0_src_tar_gz=eef63a0aeea5147930a366aee78cbde248bb6e5c6868801bdf34849152965d2d
 SHA256_rustc_1_26_0_src_tar_gz=4fb09bc4e233b71dcbe08a37a3f38cabc32219745ec6a628b18a55a1232281dd
+SHA256_rustc_1_27_0_src_tar_gz=2cb9803f690349c9fd429564d909ddd4676c68dc48b670b8ddf797c2613e2d21
+SHA256_rustc_1_28_0_src_tar_gz=1d5a81729c6f23a0a23b584dd249e35abe9c6f7569cee967cc42b1758ecd6486

common.sh

@@ -79,7 +79,7 @@ DEST_INSTALL=$DEST/install
 COMPONENTS="cargo-${CARGO_BOOTSTRAP_VERSION} rust-std-${RUSTC_BOOTSTRAP_VERSION} rustc-${RUSTC_BOOTSTRAP_VERSION}"
 
 # set path
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
+export PATH=/bin:/usr/bin:/usr/local/bin
 
 # we need these to avoid patching the sources for sha256sum
 export PATH=$PATH:$BASE/../bin
@@ -147,14 +147,14 @@ fixup-vendor-patch() {
 }
 
 extract() {
-	mkdir -p $DEST/tmp $DEST/bootstrap
+	mkdir -p $DEST/tmp $DEST/bootstrap ${DEST_INSTALL}
 
 	download rustc-$RUST_VERSION-src.tar.gz /usr/distfiles $DEST ${RUST_DIST_SERVER}/dist || exit 1
 	tar xvzf $DEST/rustc-$RUST_VERSION-src.tar.gz -C ${DEST} 2>&1 | wc -l
 
 	for component in ${COMPONENTS}; do
 		echo "INSTALL COMPONENT: ${component}"
-		tar xvzf ${BOOTSTRAP_DIR}/$component-${TARGET}.tar.xz -C $DEST/tmp
+		tar xvzf ${BOOTSTRAP_DIR}/$component-${TARGET}.tar.xz -C $DEST/tmp  || exit 1
 		# install.sh needs bash, but used !/bin/bash which does not exist on DragonFly
 		${BASH} $DEST/tmp/$component-${TARGET}/install.sh --prefix=$DEST/bootstrap
 	done
@@ -170,6 +170,18 @@ prepatch() {
 	fi
 }
 
+create-config() {
+	cat $BASE/config.toml.template | \
+		sed -e "s:%%CARGO%%:${BOOTSTRAP_COMPILER_BASE}/bin/cargo:g" | \
+		sed -e "s:%%RUSTC%%:${BOOTSTRAP_COMPILER_BASE}/bin/rustc:g" | \
+		sed -e "s:%%PREFIX%%:${DEST_INSTALL}:g" | \
+		sed -e "s:%%CC%%:${CONF_CC}:g" | \
+		sed -e "s:%%CXX%%:${CONF_CXX}:g" | \
+		sed -e "s:%%LINKER%%:${CONF_LINKER}:g" | \
+		sed -e "s:%%LLVM_CONFIG%%:${LLVM_ROOT}/bin/llvm-config:g" > \
+		$DEST/rustc-$RUST_VERSION-src/config.toml
+}
+
 config() {
 	cd $DEST/rustc-$RUST_VERSION-src
 	./configure \
@@ -200,6 +212,18 @@ inst() {
 	mk install
 }
 
+xbuild() {
+	cd $DEST/rustc-$RUST_VERSION-src && python x.py build --verbose --config ./config.toml --jobs 10
+}
+
+xdist() {
+	cd $DEST/rustc-$RUST_VERSION-src && python x.py dist --verbose --config ./config.toml
+}
+
+xinst() {
+	cd $DEST/rustc-$RUST_VERSION-src && python x.py install --verbose --config ./config.toml
+}
+
 info() {
 	echo Base: $BASE
 	echo Release-Channel: $RELEASE_CHANNEL