Add NetBSD/amd64 support This package must be built with pkgtools/cwrappers with USE_CWRAPPERS=yes.diff -r1.2 -r1.3 pkgsrc/lang/rust/Makefile
(ryoon)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2016/09/11 18:19:54 jperkin Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2016/09/12 13:27:33 ryoon Exp $ | |
2 | 2 | |||
3 | DISTNAME= rustc-1.11.0-src | 3 | DISTNAME= rustc-1.11.0-src | |
4 | PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} | 4 | PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} | |
5 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
6 | MASTER_SITES= http://static.rust-lang.org/dist/ | 6 | MASTER_SITES= http://static.rust-lang.org/dist/ | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.rust-lang.org/ | 9 | HOMEPAGE= http://www.rust-lang.org/ | |
10 | COMMENT= Safe, concurrent, practical language | 10 | COMMENT= Safe, concurrent, practical language | |
11 | LICENSE= mit OR apache-2.0 | 11 | LICENSE= mit OR apache-2.0 | |
12 | 12 | |||
13 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} | 13 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} | |
14 | 14 | |||
@@ -45,26 +45,33 @@ GCC_REQD+= 4.8 | @@ -45,26 +45,33 @@ GCC_REQD+= 4.8 | |||
45 | # | 45 | # | |
46 | # Use jemalloc on systems where rust does by default too. | 46 | # Use jemalloc on systems where rust does by default too. | |
47 | # | 47 | # | |
48 | PLIST_VARS+= jemalloc | 48 | PLIST_VARS+= jemalloc | |
49 | .if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin" | 49 | .if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin" | |
50 | . include "../../devel/jemalloc/buildlink3.mk" | 50 | . include "../../devel/jemalloc/buildlink3.mk" | |
51 | CONFIGURE_ARGS+= --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib | 51 | CONFIGURE_ARGS+= --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib | |
52 | PLIST.jemalloc= yes | 52 | PLIST.jemalloc= yes | |
53 | .else | 53 | .else | |
54 | CONFIGURE_ARGS+= --disable-jemalloc | 54 | CONFIGURE_ARGS+= --disable-jemalloc | |
55 | .endif | 55 | .endif | |
56 | 56 | |||
57 | # | 57 | # | |
58 | # Under NetBSD, do not use DT_RUNPATH | |||
59 | # | |||
60 | .if ${OPSYS} == "NetBSD" | |||
61 | BUILDLINK_TRANSFORM+= rm:-Wl,--enable-new-dtags | |||
62 | .endif | |||
63 | ||||
64 | # | |||
58 | # Can't use pkgsrc llvm on SunOS at the moment due to a relocation error. | 65 | # Can't use pkgsrc llvm on SunOS at the moment due to a relocation error. | |
59 | # | 66 | # | |
60 | .if ${OPSYS} != "SunOS" | 67 | .if ${OPSYS} != "SunOS" | |
61 | . include "../../lang/llvm/buildlink3.mk" | 68 | . include "../../lang/llvm/buildlink3.mk" | |
62 | CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} | 69 | CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} | |
63 | .endif | 70 | .endif | |
64 | 71 | |||
65 | # | 72 | # | |
66 | # Rust unfortunately requires itself to build. On platforms which aren't | 73 | # Rust unfortunately requires itself to build. On platforms which aren't | |
67 | # supported by upstream (where they offer binary bootstraps), or where we | 74 | # supported by upstream (where they offer binary bootstraps), or where we | |
68 | # do not trust random binaries from the Internet, we need to build and | 75 | # do not trust random binaries from the Internet, we need to build and | |
69 | # provide our own bootstrap. | 76 | # provide our own bootstrap. | |
70 | # | 77 | # | |
@@ -79,26 +86,28 @@ CONFIGURE_ARGS+= --enable-local-rust | @@ -79,26 +86,28 @@ CONFIGURE_ARGS+= --enable-local-rust | |||
79 | CONFIGURE_ARGS+= --local-rust-root=${WRKDIR}/rust-${RUST_STAGE2_VER}-${RUST_ARCH}/rustc | 86 | CONFIGURE_ARGS+= --local-rust-root=${WRKDIR}/rust-${RUST_STAGE2_VER}-${RUST_ARCH}/rustc | |
80 | # | 87 | # | |
81 | .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) | 88 | .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) | |
82 | RUST_ARCH= i686-apple-darwin | 89 | RUST_ARCH= i686-apple-darwin | |
83 | .elif !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) | 90 | .elif !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) | |
84 | RUST_ARCH= x86_64-apple-darwin | 91 | RUST_ARCH= x86_64-apple-darwin | |
85 | .elif !empty(MACHINE_PLATFORM:MLinux-*-i386) | 92 | .elif !empty(MACHINE_PLATFORM:MLinux-*-i386) | |
86 | RUST_ARCH= i686-unknown-linux-gnu | 93 | RUST_ARCH= i686-unknown-linux-gnu | |
87 | .elif !empty(MACHINE_PLATFORM:MLinux-*-x86_64) | 94 | .elif !empty(MACHINE_PLATFORM:MLinux-*-x86_64) | |
88 | RUST_ARCH= x86_64-unknown-linux-gnu | 95 | RUST_ARCH= x86_64-unknown-linux-gnu | |
89 | .elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) | 96 | .elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) | |
90 | RUST_ARCH= x86_64-sun-solaris | 97 | RUST_ARCH= x86_64-sun-solaris | |
91 | SITES.${RUST_STAGE2}= https://us-east.manta.joyent.com/pkgsrc/public/tmp/ | 98 | SITES.${RUST_STAGE2}= https://us-east.manta.joyent.com/pkgsrc/public/tmp/ | |
99 | .elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) | |||
100 | RUST_ARCH= x86_64-unknown-netbsd | |||
92 | .else | 101 | .else | |
93 | NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} | 102 | NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} | |
94 | .endif | 103 | .endif | |
95 | 104 | |||
96 | .if defined(RUST_ARCH) | 105 | .if defined(RUST_ARCH) | |
97 | RUST_STAGE2_VER= 1.10.0 | 106 | RUST_STAGE2_VER= 1.10.0 | |
98 | RUST_STAGE2?= rust-${RUST_STAGE2_VER}-${RUST_ARCH}.tar.gz | 107 | RUST_STAGE2?= rust-${RUST_STAGE2_VER}-${RUST_ARCH}.tar.gz | |
99 | SITES.${RUST_STAGE2}?= https://static.rust-lang.org/dist/ | 108 | SITES.${RUST_STAGE2}?= https://static.rust-lang.org/dist/ | |
100 | DISTFILES= ${DEFAULT_DISTFILES} ${RUST_STAGE2} | 109 | DISTFILES= ${DEFAULT_DISTFILES} ${RUST_STAGE2} | |
101 | .endif | 110 | .endif | |
102 | 111 | |||
103 | PLIST_SRC= PLIST | 112 | PLIST_SRC= PLIST | |
104 | .if ${OPSYS} == "Darwin" | 113 | .if ${OPSYS} == "Darwin" |
@@ -1,37 +1,42 @@ | @@ -1,37 +1,42 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2016/09/06 10:36:49 jperkin Exp $ | 1 | $NetBSD: distinfo,v 1.2 2016/09/12 13:27:33 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = aded64d8ddc5d286ffc81de21c6a8c47951ac329 | 3 | SHA1 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = aded64d8ddc5d286ffc81de21c6a8c47951ac329 | |
4 | RMD160 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 9248526a5f9656e083a221f0931f9cec6b1a0726 | 4 | RMD160 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 9248526a5f9656e083a221f0931f9cec6b1a0726 | |
5 | SHA512 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = ef1e874aadc24a64e7df0a09dfea0e5ed6a0bf7acbaf8485976c602f549141289c07b2e27cd7d0a0029f9884042d6ff00c8b917543a9284bae7f7c684ddc6904 | 5 | SHA512 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = ef1e874aadc24a64e7df0a09dfea0e5ed6a0bf7acbaf8485976c602f549141289c07b2e27cd7d0a0029f9884042d6ff00c8b917543a9284bae7f7c684ddc6904 | |
6 | Size (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 119011780 bytes | 6 | Size (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 119011780 bytes | |
7 | SHA1 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = eb84816dd0fb113fbddd75fd8c451ae67a8ab454 | |||
8 | RMD160 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = e13b58f2da1b6cbdeceeb3f1cccdc5c5b9a01c78 | |||
9 | SHA512 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = ffa251dcc5afc6d40920c333c74ecfe3e3eb3fae3c984b7715c260fdb11a4580e61097ba32bd02147c42b3b78e7f2be6a3902bb89fa55befb59d1c71c66d1cf3 | |||
10 | Size (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = 123531094 bytes | |||
7 | SHA1 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 9d88b5a1203f91ac12a2f3d33944d6dbeabf3347 | 11 | SHA1 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 9d88b5a1203f91ac12a2f3d33944d6dbeabf3347 | |
8 | RMD160 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 046553af4b914421d2ddcde64b6025f18f610bf5 | 12 | RMD160 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 046553af4b914421d2ddcde64b6025f18f610bf5 | |
9 | SHA512 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 428c53bd402094254e16b5b29303ce5565abf11275546aaa7fecf4f6ea2b13ec46a7d455b1e9c2a6f50a0fcd5573c10adcef09afd29dc390202fa152c31400ac | 13 | SHA512 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 428c53bd402094254e16b5b29303ce5565abf11275546aaa7fecf4f6ea2b13ec46a7d455b1e9c2a6f50a0fcd5573c10adcef09afd29dc390202fa152c31400ac | |
10 | Size (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 107969649 bytes | 14 | Size (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 107969649 bytes | |
11 | SHA1 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 3bbd80ac1609fe60da890ae90c4d08acb5ca77cb | 15 | SHA1 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 3bbd80ac1609fe60da890ae90c4d08acb5ca77cb | |
12 | RMD160 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = df0208b8bbcbcc8e7d4e3497cb5191a418b40b03 | 16 | RMD160 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = df0208b8bbcbcc8e7d4e3497cb5191a418b40b03 | |
13 | SHA512 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 73e5e0bdf072910b280abc1ff2dc71fa3ee1808c4a41a387c9cb5f9a69a00aaea3aa1c31ae167ad60d2a5a8730943d0c8c4c5e902e671250d3398541e80ff7fa | 17 | SHA512 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 73e5e0bdf072910b280abc1ff2dc71fa3ee1808c4a41a387c9cb5f9a69a00aaea3aa1c31ae167ad60d2a5a8730943d0c8c4c5e902e671250d3398541e80ff7fa | |
14 | Size (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 222992235 bytes | 18 | Size (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 222992235 bytes | |
15 | SHA1 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 1174c1e9e6d1de47715ecb611bf917938b8be5e9 | 19 | SHA1 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 1174c1e9e6d1de47715ecb611bf917938b8be5e9 | |
16 | RMD160 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 72878c0b697ae049919cb04b37d42cf26256f7cd | 20 | RMD160 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 72878c0b697ae049919cb04b37d42cf26256f7cd | |
17 | SHA512 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = ffcef849222a57e56e2d21e01134a45265e3f5d03d3042bf8492e54007664e9c290275cb7ffb0ff4d1b1c09e222bcd0946284390886e942aa0f53862b73fb8f2 | 21 | SHA512 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = ffcef849222a57e56e2d21e01134a45265e3f5d03d3042bf8492e54007664e9c290275cb7ffb0ff4d1b1c09e222bcd0946284390886e942aa0f53862b73fb8f2 | |
18 | Size (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 118275404 bytes | 22 | Size (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 118275404 bytes | |
19 | SHA1 (rustc-1.11.0-src.tar.gz) = d4c7177fd939be64c08b6460d89a1595b24406b4 | 23 | SHA1 (rustc-1.11.0-src.tar.gz) = d4c7177fd939be64c08b6460d89a1595b24406b4 | |
20 | RMD160 (rustc-1.11.0-src.tar.gz) = ada0761c38febb423677c1b8bb2fd5c8fee05d53 | 24 | RMD160 (rustc-1.11.0-src.tar.gz) = ada0761c38febb423677c1b8bb2fd5c8fee05d53 | |
21 | SHA512 (rustc-1.11.0-src.tar.gz) = 6ad050a02e3a3b48f205f5d5ed9393fd2a1a2237e5c78b3e51af8162f410b93a831ebe5980ce78c4d38c5a692395c7fec8442956497a5d21e9f7157404c6b5aa | 25 | SHA512 (rustc-1.11.0-src.tar.gz) = 6ad050a02e3a3b48f205f5d5ed9393fd2a1a2237e5c78b3e51af8162f410b93a831ebe5980ce78c4d38c5a692395c7fec8442956497a5d21e9f7157404c6b5aa | |
22 | Size (rustc-1.11.0-src.tar.gz) = 26126471 bytes | 26 | Size (rustc-1.11.0-src.tar.gz) = 26126471 bytes | |
23 | SHA1 (patch-mk_cfg_x86__64-apple-darwin.mk) = 37b50b64ea5607588d541852e07f02a4611d38c8 | 27 | SHA1 (patch-mk_cfg_x86__64-apple-darwin.mk) = 37b50b64ea5607588d541852e07f02a4611d38c8 | |
24 | SHA1 (patch-mk_rt.mk) = 888bd6646305c357044f37db9cb23f9d2fe77d90 | 28 | SHA1 (patch-mk_rt.mk) = 51238ae320b47296546537aeb050773511049d11 | |
25 | SHA1 (patch-mk_rustllvm.mk) = 500ce129d9ea83fc97317679b45a79f12c8ca9e8 | 29 | SHA1 (patch-mk_rustllvm.mk) = 500ce129d9ea83fc97317679b45a79f12c8ca9e8 | |
26 | SHA1 (patch-src_etc_local__stage0.sh) = fbfacff23a9236b2c32a49abb2b520be264ece59 | 30 | SHA1 (patch-src_compiler-rt_lib_builtins_CMakeLists.txt) = 288870c40b5e4ce29cbfb19cc9f56d35152c47fa | |
31 | SHA1 (patch-src_etc_local__stage0.sh) = 28de26517296557d611afd0db0d43aa046b1676f | |||
27 | SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = 7279fb49054d203b045327a5b9c52b2fbdc2c8d6 | 32 | SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = 7279fb49054d203b045327a5b9c52b2fbdc2c8d6 | |
28 | SHA1 (patch-src_librustc__trans_back_linker.rs) = 279850f534bed6380bbc3ffd47e49938fa6423df | 33 | SHA1 (patch-src_librustc__trans_back_linker.rs) = 279850f534bed6380bbc3ffd47e49938fa6423df | |
29 | SHA1 (patch-src_libstd_rtdeps.rs) = ed271c5b83a8d623469abd39a2d072bfffbcc890 | 34 | SHA1 (patch-src_libstd_rtdeps.rs) = ed271c5b83a8d623469abd39a2d072bfffbcc890 | |
30 | SHA1 (patch-src_libstd_sys_unix_thread.rs) = 03ea5a505427faeaf66a58cb2134ac651daf3fb5 | 35 | SHA1 (patch-src_libstd_sys_unix_thread.rs) = 03ea5a505427faeaf66a58cb2134ac651daf3fb5 | |
31 | SHA1 (patch-src_llvm_Makefile.rules) = c5f76ef8ee1fc283d2feb7dc388c7938a81c8849 | 36 | SHA1 (patch-src_llvm_Makefile.rules) = c5f76ef8ee1fc283d2feb7dc388c7938a81c8849 | |
32 | SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f | 37 | SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f | |
33 | SHA1 (patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp) = 2899771b1a23be840b9305eff7e5e5f957239ccb | 38 | SHA1 (patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp) = 2899771b1a23be840b9305eff7e5e5f957239ccb | |
34 | SHA1 (patch-src_llvm_utils_buildit_build__llvm) = bc2c729153f3eee77ff3f018364544b947bab9d0 | 39 | SHA1 (patch-src_llvm_utils_buildit_build__llvm) = bc2c729153f3eee77ff3f018364544b947bab9d0 | |
35 | SHA1 (patch-src_rust-installer_gen-install-script.sh) = 689ff4e8fa3ee9cd41202b40b6575f568eef6415 | 40 | SHA1 (patch-src_rust-installer_gen-install-script.sh) = 689ff4e8fa3ee9cd41202b40b6575f568eef6415 | |
36 | SHA1 (patch-src_rust-installer_gen-installer.sh) = 43087b7471bfb9b0bcbd7c94cc0de22b2dd2f757 | 41 | SHA1 (patch-src_rust-installer_gen-installer.sh) = 43087b7471bfb9b0bcbd7c94cc0de22b2dd2f757 | |
37 | SHA1 (patch-src_rust-installer_install-template.sh) = 85be7f5a0706c3d3fa9078458555723e797a7c5e | 42 | SHA1 (patch-src_rust-installer_install-template.sh) = 85be7f5a0706c3d3fa9078458555723e797a7c5e |
@@ -1,18 +1,23 @@ | @@ -1,18 +1,23 @@ | |||
1 | $NetBSD: patch-mk_rt.mk,v 1.1 2016/09/06 10:36:49 jperkin Exp $ | 1 | $NetBSD: patch-mk_rt.mk,v 1.2 2016/09/12 13:27:33 ryoon Exp $ | |
2 | 2 | |||
3 | Fix library location on SunOS. | 3 | Fix library location on SunOS. | |
4 | 4 | |||
5 | --- mk/rt.mk.orig 2016-08-16 01:54:35.000000000 +0000 | 5 | --- mk/rt.mk.orig 2016-08-16 01:54:35.000000000 +0000 | |
6 | +++ mk/rt.mk | 6 | +++ mk/rt.mk | |
7 | @@ -269,6 +269,11 @@ endif | 7 | @@ -269,6 +269,16 @@ endif | |
8 | COMPRT_DEFINES_$(1) := -DCOMPILER_RT_ENABLE_IOS=ON | 8 | COMPRT_DEFINES_$(1) := -DCOMPILER_RT_ENABLE_IOS=ON | |
9 | endif | 9 | endif | |
10 | 10 | |||
11 | +ifeq ($$(findstring solaris,$(1)),solaris) | 11 | +ifeq ($$(findstring solaris,$(1)),solaris) | |
12 | +COMPRT_DIR_$(1) := sunos | 12 | +COMPRT_DIR_$(1) := sunos | |
13 | +COMPRT_LIB_NAME_$(1) := clang_rt.builtins-$$(COMPRT_ARCH_$(1)) | 13 | +COMPRT_LIB_NAME_$(1) := clang_rt.builtins-$$(COMPRT_ARCH_$(1)) | |
14 | +endif | 14 | +endif | |
15 | + | 15 | + | |
16 | +ifeq ($$(findstring netbsd,$(1)),netbsd) | |||
17 | +COMPRT_DIR_$(1) := netbsd | |||
18 | +COMPRT_LIB_NAME_$(1) := clang_rt.builtins-$$(COMPRT_ARCH_$(1)) | |||
19 | +endif | |||
20 | + | |||
16 | ifndef COMPRT_DIR_$(1) | 21 | ifndef COMPRT_DIR_$(1) | |
17 | # NB: FreeBSD and NetBSD output to "linux"... | 22 | # NB: FreeBSD and NetBSD output to "linux"... | |
18 | COMPRT_DIR_$(1) := linux | 23 | COMPRT_DIR_$(1) := linux |
@@ -1,20 +1,26 @@ | @@ -1,20 +1,26 @@ | |||
1 | $NetBSD: patch-src_etc_local__stage0.sh,v 1.1 2016/09/06 10:36:49 jperkin Exp $ | 1 | $NetBSD: patch-src_etc_local__stage0.sh,v 1.2 2016/09/12 13:27:33 ryoon Exp $ | |
2 | ||||
3 | Copy additional libarena required on Darwin. | |||
4 | Copy GCC support libraries required on SunOS. | |||
5 | 2 | |||
6 | --- src/etc/local_stage0.sh.orig 2016-08-16 01:54:35.000000000 +0000 | 3 | --- src/etc/local_stage0.sh.orig 2016-08-16 01:54:35.000000000 +0000 | |
7 | +++ src/etc/local_stage0.sh | 4 | +++ src/etc/local_stage0.sh | |
5 | @@ -18,7 +18,7 @@ LIB_PREFIX=lib | |||
6 | ||||
7 | OS=`uname -s` | |||
8 | case $OS in | |||
9 | - ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS") | |||
10 | + ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS"|"NetBSD") | |||
11 | BIN_SUF= | |||
12 | LIB_SUF=.so | |||
13 | ;; | |||
8 | @@ -51,6 +51,7 @@ fi | 14 | @@ -51,6 +51,7 @@ fi | |
9 | 15 | |||
10 | cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ | 16 | cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ | |
11 | cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ | 17 | cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ | |
12 | +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}arena*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 18 | +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}arena*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
13 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 19 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
14 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 20 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
15 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 21 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
16 | @@ -63,6 +64,9 @@ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}log | 22 | @@ -63,6 +64,9 @@ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}log | |
17 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rbml*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 23 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rbml*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
18 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}serialize*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 24 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}serialize*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
19 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}term*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | 25 | cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}term*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ | |
20 | +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}gcc_s*${LIB_SUF}* ${TARG_DIR}/stage0/${LIB_DIR}/ | 26 | +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}gcc_s*${LIB_SUF}* ${TARG_DIR}/stage0/${LIB_DIR}/ |
$NetBSD: patch-src_compiler-rt_lib_builtins_CMakeLists.txt,v 1.1 2016/09/12 13:27:33 ryoon Exp $
* On NetBSD, do not misdetect unwind.h
We do not support ARM build currently, so remove this unconditionally.
--- src/compiler-rt/lib/builtins/CMakeLists.txt.orig 2016-08-16 01:54:40.000000000 +0000
+++ src/compiler-rt/lib/builtins/CMakeLists.txt
@@ -159,12 +159,6 @@ if(NOT WIN32 OR MINGW)
emutls.c)
endif()
-if (HAVE_UNWIND_H)
- set(GENERIC_SOURCES
- ${GENERIC_SOURCES}
- gcc_personality_v0.c)
-endif ()
-
if (NOT MSVC)
set(x86_64_SOURCES
x86_64/chkstk.S