diff options
-rw-r--r-- | lang/rust/Makefile | 16 | ||||
-rw-r--r-- | lang/rust/distinfo | 8 | ||||
-rw-r--r-- | lang/rust/patches/patch-src_llvm_CMakeLists.txt | 18 | ||||
-rw-r--r-- | lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake | 34 |
4 files changed, 67 insertions, 9 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 2e36a943642..23f845532aa 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/06/19 13:23:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2018/06/21 17:13:13 jperkin Exp $ DISTNAME= rustc-1.26.2-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -100,13 +100,13 @@ RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif -#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -#RUST_ARCH:= x86_64-sun-solaris -#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz -#SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ -#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} -#RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} -#.endif +.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= x86_64-sun-solaris +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} +.endif .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH:= i686-unknown-freebsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz diff --git a/lang/rust/distinfo b/lang/rust/distinfo index c35c9a3b603..c1db6808b41 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2018/06/19 13:23:25 ryoon Exp $ +$NetBSD: distinfo,v 1.26 2018/06/21 17:13:13 jperkin Exp $ SHA1 (rust-1.25.0-i686-apple-darwin.tar.gz) = a8581e6741b326f717cf8a5f263363212ba67793 RMD160 (rust-1.25.0-i686-apple-darwin.tar.gz) = 883e0dad512ca16697161a41fae0215439c7ac01 @@ -20,6 +20,10 @@ SHA1 (rust-1.25.0-x86_64-apple-darwin.tar.gz) = 30e7d674007b87d19eda9ae9147472e7 RMD160 (rust-1.25.0-x86_64-apple-darwin.tar.gz) = 4ee6418816c7f54cfd76951e7519ee302d5f4856 SHA512 (rust-1.25.0-x86_64-apple-darwin.tar.gz) = f38ed1e6b30bde9dc972675c9f0270fd62df25f829638bb315333fca09c241305d55da52bbe11512192b7f8c532da27c3940dd3554ba77f2ab42289ec76ffb03 Size (rust-1.25.0-x86_64-apple-darwin.tar.gz) = 143715436 bytes +SHA1 (rust-1.25.0-x86_64-sun-solaris.tar.gz) = bc2b46829ea5ef798414e05711c7d80220122d4d +RMD160 (rust-1.25.0-x86_64-sun-solaris.tar.gz) = f6f51fd4190fdb410c330021e4ecadadb211a925 +SHA512 (rust-1.25.0-x86_64-sun-solaris.tar.gz) = 8247acca5e356468baed02ea8e3ddcbba7ad8cc6533163433ed0aa1b825cace4a37de016b07e1d15dc57f605c38440ce994cdc3e44d17c73985022a5bca78a49 +Size (rust-1.25.0-x86_64-sun-solaris.tar.gz) = 172771923 bytes SHA1 (rust-1.25.0-x86_64-unknown-freebsd.tar.gz) = fb0420d1548d63dc470bce8aea13f6947be63c18 RMD160 (rust-1.25.0-x86_64-unknown-freebsd.tar.gz) = feb779bbbb666ad4cfc7dd0aa780e79655d8d9d6 SHA512 (rust-1.25.0-x86_64-unknown-freebsd.tar.gz) = 85ed03069e2febcafe22e9b86b4e1573e5069720919140a27a3cdcc516a9843a772be79640dc43d0e395d0ae88780d4e0332af0cead81b41f1b6534e739033f3 @@ -72,4 +76,6 @@ SHA1 (patch-src_bootstrap_bin_rustc.rs) = d9787517f03162d3548e89a91ecf933fd67774 SHA1 (patch-src_bootstrap_lib.rs) = d86e173b931099730a4f18d044d7977c89f87b91 SHA1 (patch-src_libbacktrace_configure) = b2c1e9b93a99408aad42ab9f1af27704cc81bdd8 SHA1 (patch-src_libstd_build.rs) = 32dad8a474300f9f37bce8b92acca762cf8cc4ab +SHA1 (patch-src_llvm_CMakeLists.txt) = ffdf4337fdc84d8314c97c4e492e6b84244a99d1 SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f +SHA1 (patch-src_llvm_include_llvm_Support_DataTypes.h.cmake) = 61cba4480d97e740d361708eb8e5c9b13bb2d36e diff --git a/lang/rust/patches/patch-src_llvm_CMakeLists.txt b/lang/rust/patches/patch-src_llvm_CMakeLists.txt new file mode 100644 index 00000000000..47f82303f3a --- /dev/null +++ b/lang/rust/patches/patch-src_llvm_CMakeLists.txt @@ -0,0 +1,18 @@ +$NetBSD: patch-src_llvm_CMakeLists.txt,v 1.1 2018/06/21 17:13:13 jperkin Exp $ + +Don't implement sys/regset.h workaround, fix source instead. + +--- src/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000 ++++ src/llvm/CMakeLists.txt +@@ -806,11 +806,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBS + link_directories("/usr/local/lib") + endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + +-if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) +- # special hack for Solaris to handle crazy system sys/regset.h +- include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris") +-endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) +- + # Make sure we don't get -rdynamic in every binary. For those that need it, + # use export_executable_symbols(target). + set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") diff --git a/lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake b/lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake new file mode 100644 index 00000000000..f87cf91849d --- /dev/null +++ b/lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake @@ -0,0 +1,34 @@ +$NetBSD: patch-src_llvm_include_llvm_Support_DataTypes.h.cmake,v 1.1 2018/06/21 17:13:13 jperkin Exp $ + +Don't implement sys/regset.h workaround, fix source instead. + +--- src/llvm/include/llvm/Support/DataTypes.h.cmake.orig 2018-03-10 02:51:13.000000000 +0000 ++++ src/llvm/include/llvm/Support/DataTypes.h.cmake +@@ -132,4 +132,27 @@ typedef signed int ssize_t; + #define HUGE_VALF (float)HUGE_VAL + #endif + ++#if defined(__sun) ++#include <sys/regset.h> ++#undef CS ++#undef DS ++#undef ES ++#undef FS ++#undef GS ++#undef SS ++#undef EAX ++#undef ECX ++#undef EDX ++#undef EBX ++#undef ESP ++#undef EBP ++#undef ESI ++#undef EDI ++#undef EIP ++#undef UESP ++#undef EFL ++#undef ERR ++#undef TRAPNO ++#endif ++ + #endif /* SUPPORT_DATATYPES_H */ |