Sun Oct 7 23:12:49 2018 UTC ()
Try to fix "warning: duplicate script for target "pre-build" ignored"


(ryoon)
diff -r1.52 -r1.53 pkgsrc/lang/rust/Makefile
cvs diff -r1.52 -r1.53 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2018/09/30 16:19:54 1.52
+++ pkgsrc/lang/rust/Makefile 2018/10/07 23:12:49 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.52 2018/09/30 16:19:54 minskim Exp $ 1# $NetBSD: Makefile,v 1.53 2018/10/07 23:12:49 ryoon Exp $
2 2
3DISTNAME= rustc-1.29.1-src 3DISTNAME= rustc-1.29.1-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://static.rust-lang.org/dist/ 6MASTER_SITES= http://static.rust-lang.org/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.rust-lang.org/ 9HOMEPAGE= https://www.rust-lang.org/
10COMMENT= Safe, concurrent, practical language 10COMMENT= Safe, concurrent, practical language
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
@@ -52,99 +52,108 @@ CHECK_SSP_SUPPORTED= no @@ -52,99 +52,108 @@ CHECK_SSP_SUPPORTED= no
52 52
53CHECK_PORTABILITY_SKIP+= src/vendor/openssl-src/openssl/.travis-create-release.sh 53CHECK_PORTABILITY_SKIP+= src/vendor/openssl-src/openssl/.travis-create-release.sh
54 54
55# Required for LLVM (-std=c++11) 55# Required for LLVM (-std=c++11)
56GCC_REQD+= 4.8 56GCC_REQD+= 4.8
57 57
58.include "../../mk/bsd.prefs.mk" 58.include "../../mk/bsd.prefs.mk"
59 59
60# 60#
61# Under NetBSD, do not use DT_RUNPATH 61# Under NetBSD, do not use DT_RUNPATH
62# 62#
63BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags 63BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
64 64
 65.PHONY: pre-build-fix
65# 66#
66# Rust unfortunately requires itself to build. On platforms which aren't 67# Rust unfortunately requires itself to build. On platforms which aren't
67# supported by upstream (where they offer binary bootstraps), or where we do 68# supported by upstream (where they offer binary bootstraps), or where we do
68# not trust random binaries from the Internet, we need to build and provide our 69# not trust random binaries from the Internet, we need to build and provide our
69# own bootstrap. See the stage0-bootstrap below for more details. 70# own bootstrap. See the stage0-bootstrap below for more details.
70# 71#
71DISTFILES:= ${DEFAULT_DISTFILES} 72DISTFILES:= ${DEFAULT_DISTFILES}
72RUST_STAGE0_VER= 1.28.0 73RUST_STAGE0_VER= 1.28.0
73# 74#
74.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi) 75.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi)
75RUST_ARCH:= i686-apple-darwin 76RUST_ARCH:= i686-apple-darwin
76RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 77RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
77RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 78RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
78DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 79DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 80pre-build-fix:
79.endif 81.endif
80.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 82.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
81RUST_ARCH:= x86_64-apple-darwin 83RUST_ARCH:= x86_64-apple-darwin
82RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 84RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
83RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 85RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
84DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 86DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 87pre-build-fix:
85.endif 88.endif
86.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi) 89.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
87RUST_ARCH:= i686-unknown-linux-gnu 90RUST_ARCH:= i686-unknown-linux-gnu
88RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 91RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
89RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 92RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
90DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 93DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 94pre-build-fix:
91.endif 95.endif
92.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 96.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
93RUST_ARCH:= x86_64-unknown-linux-gnu 97RUST_ARCH:= x86_64-unknown-linux-gnu
94RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 98RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
95RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 99RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
96DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 100DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 101pre-build-fix:
97.endif 102.endif
98.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 103.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
99RUST_ARCH:= x86_64-sun-solaris 104RUST_ARCH:= x86_64-sun-solaris
100RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 105RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
101SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ 106SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
102DISTFILES:= ${DISTFILES} ${RUST_STAGE0} 107DISTFILES:= ${DISTFILES} ${RUST_STAGE0}
103RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} 108RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
 109pre-build-fix:
104.endif 110.endif
105.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) 111.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
106RUST_ARCH:= i686-unknown-freebsd 112RUST_ARCH:= i686-unknown-freebsd
107RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 113RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
108RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 114RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
109DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 115DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 116pre-build-fix:
110.endif 117.endif
111.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 118.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
112RUST_ARCH:= x86_64-unknown-freebsd 119RUST_ARCH:= x86_64-unknown-freebsd
113RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 120RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
114RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 121RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
115DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 122DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 123pre-build-fix:
116.endif 124.endif
117.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) 125.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
118RUST_ARCH= i686-unknown-netbsd 126RUST_ARCH= i686-unknown-netbsd
119RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 127RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
120RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 128RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
121# Do not trust ryoon@. 129# Do not trust ryoon@.
122SITES.${RUST_STAGE0}= https://deuterium.ryoon.net/pub/rust/ 130SITES.${RUST_STAGE0}= https://deuterium.ryoon.net/pub/rust/
123SITES.${RUST_STD_STAGE0}= https://deuterium.ryoon.net/pub/rust/ 131SITES.${RUST_STD_STAGE0}= https://deuterium.ryoon.net/pub/rust/
124DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 132DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
125# Setting this changes it for every distfile, which doesn't match what is 133# Setting this changes it for every distfile, which doesn't match what is
126# currently in distinfo. 134# currently in distinfo.
127#DIST_SUBDIR= ${PKGNAME} 135#DIST_SUBDIR= ${PKGNAME}
128# For atomic ops 136# For atomic ops
129CFLAGS+= -march=i586 137CFLAGS+= -march=i586
130pre-build: 138pre-build-fix:
131 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo 139 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
132.endif 140.endif
133.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 141.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
134RUST_ARCH= x86_64-unknown-netbsd 142RUST_ARCH= x86_64-unknown-netbsd
135RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 143RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
136RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 144RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
137DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 145DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 146pre-build-fix:
138.endif 147.endif
139 148
140# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler. 149# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler.
141.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH) 150.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH)
142NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} 151NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
143.else 152.else
144RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap 153RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
145.endif 154.endif
146 155
147.if ${OPSYS} == "SunOS" 156.if ${OPSYS} == "SunOS"
148BUILD_DEPENDS+= grep>=0:../../textproc/grep 157BUILD_DEPENDS+= grep>=0:../../textproc/grep
149BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils 158BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils
150TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 159TOOLS_PATH.grep= ${PREFIX}/bin/ggrep
@@ -172,27 +181,27 @@ post-extract: @@ -172,27 +181,27 @@ post-extract:
172 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched 181 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched
173 ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \ 182 ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \
174 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json 183 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json
175 184
176.if ${OPSYS} != "SunOS" 185.if ${OPSYS} != "SunOS"
177LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/lib 186LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/lib
178PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q} 187PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q}
179.endif 188.endif
180 189
181.if ${OPSYS} == "FreeBSD" 190.if ${OPSYS} == "FreeBSD"
182MAKE_ENV+= OPENSSL_DIR=${SSLBASE} 191MAKE_ENV+= OPENSSL_DIR=${SSLBASE}
183.endif 192.endif
184 193
185pre-build: 194pre-build: pre-build-fix
186 # Requires libssh2 defines only available in master. 195 # Requires libssh2 defines only available in master.
187 ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \ 196 ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \
188 ${BUILDLINK_DIR}/include/ 197 ${BUILDLINK_DIR}/include/
189 198
190do-build: 199do-build:
191 cd ${WRKSRC} \ 200 cd ${WRKSRC} \
192 && env ${MAKE_ENV} \ 201 && env ${MAKE_ENV} \
193 ${PYTHONBIN} ./x.py -v dist 202 ${PYTHONBIN} ./x.py -v dist
194 203
195do-install: 204do-install:
196 cd ${WRKSRC} \ 205 cd ${WRKSRC} \
197 && env ${MAKE_ENV} ${INSTALL_ENV} \ 206 && env ${MAKE_ENV} ${INSTALL_ENV} \
198 ${PYTHONBIN} ./x.py -v install 207 ${PYTHONBIN} ./x.py -v install