On Wed, Aug 21, 2019 at 02:34:20PM +0200, Sebastien Marie wrote:
> Hi,
>
> The following diff will enable lang/rust and all ports using rust on
> sparc64 (Cc all maintainers).
>
> - add sparc64 to RUST_ARCHS
> - patches all ports using Rust to use a newer libc-rs with sparc64 support
> - enable lang/rust build now ports has changed to copte with libc-rs
>
New diff, with just a small correction librsvg to copte with the dual
version (2.44.14 and 2.40.20) in post-patch.
Having the diff tested in a bulk would help.
But individual ok from port maintainers would be fine too (for now, only
librsvg maintainer replied).
Thanks.
--
Sebastien Marie
diff refs/heads/master refs/heads/rust
blob - efbd02a555354c3d71a6ad1fd34766831ac48d09
blob + f6cf3de205aa9ca8bd6a88ae7694dbc1229eef9a
--- devel/cbindgen/Makefile
+++ devel/cbindgen/Makefile
@@ -14,10 +14,14 @@ PERMIT_PACKAGE = Yes
# as devel/cargo MODULES adds DISTFILES, GH_* didn't
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
+COMPILER = base-clang ports-gcc
+
MODULES = devel/cargo
CONFIGURE_STYLE = cargo
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += ansi_term 0.11.0 # MIT
MODCARGO_CRATES += atty 0.2.11 # MIT
MODCARGO_CRATES += autocfg 0.1.4 # Apache-2.0/MIT
@@ -27,7 +31,7 @@ MODCARGO_CRATES += clap 2.33.0 # MIT
MODCARGO_CRATES += cloudabi 0.0.3 # BSD-2-Clause
MODCARGO_CRATES += fuchsia-cprng 0.1.1 # LICENSE
MODCARGO_CRATES += itoa 0.4.4 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.58 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += log 0.4.6 # MIT/Apache-2.0
MODCARGO_CRATES += numtoa 0.1.0 # MIT OR Apache-2.0
MODCARGO_CRATES += proc-macro2 0.4.30 # MIT/Apache-2.0
blob - 4c4ae6d2780a31718a4b8dfac12fd2d3363d3987
blob + ec3344b3fa36f126e6fc62718dc479f5dac91f44
--- devel/cbindgen/distinfo
+++ devel/cbindgen/distinfo
@@ -7,7 +7,7 @@ SHA256 (cargo/clap-2.33.0.tar.gz) = UGf1uy2A711otMh9uB
SHA256 (cargo/cloudabi-0.0.3.tar.gz) =
3fxbmqXUUHrK+HLecQUd/Q4wmGDoiWbhBR5GKgd6rE8=
SHA256 (cargo/fuchsia-cprng-0.1.1.tar.gz) =
oG931SbBpgG3xM3Zj1S16qv/wU1fLwKW/r3H81fG07o=
SHA256 (cargo/itoa-0.4.4.tar.gz) = UBJmt+3QF0+FMCSPh/mciPvmDKTvPdSGg1uNjVMTb38=
-SHA256 (cargo/libc-0.2.58.tar.gz) =
YoG4Z5a6XkNmAAvm6eGL81WArfnmP74ilKrbWHYToxk=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/log-0.4.6.tar.gz) = yE7EtSeVCqg6MpdUsB2+P1g2HRxe+s0fbWjElNCKF8Y=
SHA256 (cargo/numtoa-0.1.0.tar.gz) =
uPi98z3xlYWQduVKsR7nihsgg4LTom7EDRQv/B7MSe8=
SHA256 (cargo/proc-macro2-0.4.30.tar.gz) =
zz0gEatckJM494h/T8iW01ky4pFGwSyNAdprIqgLp1k=
@@ -52,7 +52,7 @@ SIZE (cargo/clap-2.33.0.tar.gz) = 196458
SIZE (cargo/cloudabi-0.0.3.tar.gz) = 22156
SIZE (cargo/fuchsia-cprng-0.1.1.tar.gz) = 2950
SIZE (cargo/itoa-0.4.4.tar.gz) = 11147
-SIZE (cargo/libc-0.2.58.tar.gz) = 409031
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/log-0.4.6.tar.gz) = 22303
SIZE (cargo/numtoa-0.1.0.tar.gz) = 8999
SIZE (cargo/proc-macro2-0.4.30.tar.gz) = 34731
blob - 46b55edd896962131bdb1e001ddea74aea69a025
blob + 8c25bfc77f315124ecc3c6d78790d0c5e5ad4e3c
--- infrastructure/mk/arch-defines.mk
+++ infrastructure/mk/arch-defines.mk
@@ -25,7 +25,7 @@ MONO_ARCHS = amd64 i386
OCAML_NATIVE_ARCHS = i386 amd64
OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64
GO_ARCHS = amd64 arm i386
-RUST_ARCHS = amd64 i386 aarch64
+RUST_ARCHS = aarch64 amd64 i386 sparc64
# arches where the base compiler is clang
CLANG_ARCHS = aarch64 amd64 arm i386 mips64
blob - f66b48f4ff9e91d958e382262ba1e826f6f391db
blob + 82c6abf55b6471f757077b4be66f5e3d2facbd06
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -1,8 +1,6 @@
# $OpenBSD: Makefile,v 1.100 2019/08/16 18:14:21 semarie Exp $
-ONLY_FOR_ARCHS = ${RUST_ARCHS} sparc64
-
-BROKEN-sparc64 = others ports needs rust libc update
+ONLY_FOR_ARCHS = ${RUST_ARCHS}
.if "${MACHINE_ARCH}" == "i386"
DPB_PROPERTIES = lonesome
blob - 1bfd8dc46dbb8f7d361a966efcc2dc8038d5915c
blob + 8d45713032e5e153fc7821fe9b50246a864c3a8f
--- security/sn0int/Makefile
+++ security/sn0int/Makefile
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2019/07/04 06:58:28 sthen Exp $
BROKEN-i386 = error[E0428]: the name `U1024` is defined multiple times
+BROKEN-sparc64= ring build-script error: called `Option::unwrap()` on a
`None` value
COMMENT = semi-automatic OSINT framework and package manager
@@ -26,6 +27,8 @@ BUILD_DEPENDS = lang/rust>=1.34 \
RUN_DEPENDS = net/libmaxminddb,-asn \
net/libmaxminddb,-city
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += adler32 1.0.3 # BSD-3-Clause AND Zlib
MODCARGO_CRATES += aho-corasick 0.7.3 # Unlicense/MIT
MODCARGO_CRATES += ansi_term 0.11.0 # MIT
@@ -165,7 +168,7 @@ MODCARGO_CRATES += kuchiki 0.7.3 # MIT
MODCARGO_CRATES += language-tags 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.3.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.54 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += libflate 0.1.22 # MIT
MODCARGO_CRATES += libsqlite3-sys 0.12.0 # MIT
MODCARGO_CRATES += libz-sys 1.0.25 # MIT/Apache-2.0
blob - 0fb70b533bd335f99bf0cb96978699cdb24d083c
blob + d5c29ef1fe1a50ecc2636054186f48e5c6cd0d03
--- security/sn0int/distinfo
+++ security/sn0int/distinfo
@@ -137,7 +137,7 @@ SHA256 (cargo/kuchiki-0.7.3.tar.gz) = SnwOkVm13/OofTMV
SHA256 (cargo/language-tags-0.2.2.tar.gz) =
qR2IS2ZnzWBrtaaaoMmbqBGhFfxokV5wVuwIpG6TGZo=
SHA256 (cargo/lazy_static-1.3.0.tar.gz) =
vFcp8n8Vnd1h9N9iKOgn6GZD1NPnwyGDyzChwI9gShQ=
SHA256 (cargo/lazycell-1.2.1.tar.gz) =
spTW+p7kCaBUNUr8Q1Kwue98oiLGm4gSy+qefSvzeD8=
-SHA256 (cargo/libc-0.2.54.tar.gz) =
xnhap92Xb1+/O3HP2c1J1/eDwf9WWoWNcQMcbDE6pcY=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/libflate-0.1.22.tar.gz) =
xSOErrItDOgqENjd819/tHF9GyPqxblM040gUPtTdmo=
SHA256 (cargo/libsqlite3-sys-0.12.0.tar.gz) =
/WRXxwu/9FbZ/kneq6NexHw+WYv415UP8Fdc63qKatE=
SHA256 (cargo/libz-sys-1.0.25.tar.gz) =
LrXkM2LjjivKL9X1E0xNRWSiOlwo6blUEWUgIahnXr4=
@@ -518,7 +518,7 @@ SIZE (cargo/kuchiki-0.7.3.tar.gz) = 17390
SIZE (cargo/language-tags-0.2.2.tar.gz) = 12754
SIZE (cargo/lazy_static-1.3.0.tar.gz) = 10616
SIZE (cargo/lazycell-1.2.1.tar.gz) = 11691
-SIZE (cargo/libc-0.2.54.tar.gz) = 401259
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/libflate-0.1.22.tar.gz) = 35923
SIZE (cargo/libsqlite3-sys-0.12.0.tar.gz) = 2197131
SIZE (cargo/libz-sys-1.0.25.tar.gz) = 650151
blob - 76a1a237fea0704efd4aea22753d69423f174bbf
blob + 0b32b6f32b24bfca0abb078598f370e43602f4ff
--- security/suricata/Makefile
+++ security/suricata/Makefile
@@ -57,6 +57,11 @@ CONFIGURE_ARGS = --disable-gccmarch-native \
SUBST_VARS = VARBASE SURICATA_V SUPDATE_V
+post-patch:
+ # permit patching libc-rs to support sparc64 (could be removed with
libc>=0.2.63)
+ sed -i 's/"files":{[^}]*}/"files":{}/' \
+ ${WRKSRC}/rust/vendor/libc/.cargo-checksum.json
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suricata/rules
${INSTALL_DATA} ${WRKSRC}/*.config ${PREFIX}/share/examples/suricata
blob - /dev/null
blob + 70d286bc3c01e6369dcde33e032ef94f32bcb7b0
--- /dev/null
+++
security/suricata/patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs
@@ -0,0 +1,18 @@
+$OpenBSD$
+add minimal sparc64 support
+could be removed with libc>=0.2.63
+Index: vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+--- rust/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs.orig
++++ rust/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+@@ -273,6 +273,11 @@ cfg_if! {
+ } else if #[cfg(target_arch = "aarch64")] {
+ mod aarch64;
+ pub use self::aarch64::*;
++ } else if #[cfg(target_arch = "sparc64")] {
++ pub type c_long = i64;
++ pub type c_ulong = u64;
++ pub type c_char = i8;
++ pub const _ALIGNBYTES: usize = 0xf;
+ } else {
+ // Unknown target_arch
+ }
blob - 381908d1d9a97a01bec537143bd05e250a6c0973
blob + d6d3d1b9e067e934921d81d5beec39eab200f1bb
--- sysutils/exa/Makefile
+++ sysutils/exa/Makefile
@@ -15,8 +15,9 @@ PERMIT_PACKAGE = Yes
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODULES = devel/cargo
-BUILD_DEPENDS = lang/rust
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += aho-corasick 0.7.3 # Unlicense/MIT
MODCARGO_CRATES += ansi_term 0.12.0 # MIT
MODCARGO_CRATES += atty 0.2.11 # MIT
@@ -34,7 +35,7 @@ MODCARGO_CRATES += idna 0.1.5 # MIT/Apache-2.0
MODCARGO_CRATES += iso8601 0.1.1 # MIT
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.51 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += libgit2-sys 0.8.1 # MIT/Apache-2.0
MODCARGO_CRATES += libz-sys 1.0.25 # MIT/Apache-2.0
MODCARGO_CRATES += locale 0.2.2 # MIT
blob - 127f23a83919d23aa1c74ffd1c2ea7489178ecb8
blob + ff09385610cf8bd26146c586b191fa6518b730c7
--- sysutils/exa/distinfo
+++ sysutils/exa/distinfo
@@ -15,7 +15,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeDwsftV/e4fF0cK2
SHA256 (cargo/iso8601-0.1.1.tar.gz) =
EdxGT4xvF1ldGRRHycZVkpiy0CPW+EakojrH6jxGxHc=
SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) =
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
SHA256 (cargo/lazy_static-1.3.0.tar.gz) =
vFcp8n8Vnd1h9N9iKOgn6GZD1NPnwyGDyzChwI9gShQ=
-SHA256 (cargo/libc-0.2.51.tar.gz) =
vtzHqAkHZlZIb/4EWr7qwWPaG1WOljox4p+/vrqRaRc=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/libgit2-sys-0.8.1.tar.gz) =
lBpB4j93MjuMnS7hGK7J7jnfwXYHjBi0dX07rQSdn/c=
SHA256 (cargo/libz-sys-1.0.25.tar.gz) =
LrXkM2LjjivKL9X1E0xNRWSiOlwo6blUEWUgIahnXr4=
SHA256 (cargo/locale-0.2.2.tar.gz) =
X9vkkqnAI42pAKEWXEL8UGcWHOKSZ4pv6Akh8w/jB/0=
@@ -79,7 +79,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735
SIZE (cargo/iso8601-0.1.1.tar.gz) = 7770
SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
SIZE (cargo/lazy_static-1.3.0.tar.gz) = 10616
-SIZE (cargo/libc-0.2.51.tar.gz) = 397323
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/libgit2-sys-0.8.1.tar.gz) = 1264574
SIZE (cargo/libz-sys-1.0.25.tar.gz) = 650151
SIZE (cargo/locale-0.2.2.tar.gz) = 18910
blob - fe6e1370039e5157cc5bfb9e643a3e2f5173fea6
blob + 2360ae1694a03ce65c3774ebb8252fbb5beffc5f
--- textproc/ripgrep/Makefile
+++ textproc/ripgrep/Makefile
@@ -20,6 +20,8 @@ MODULES = devel/cargo
BUILD_DEPENDS = lang/rust>=1.20 \
textproc/asciidoc
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += aho-corasick 0.6.8 # Unlicense/MIT
MODCARGO_CRATES += arrayvec 0.4.7 # MIT/Apache-2.0
MODCARGO_CRATES += atty 0.2.11 # MIT
@@ -42,7 +44,7 @@ MODCARGO_CRATES += glob 0.2.11 # MIT/Apache-2.0
MODCARGO_CRATES += fuchsia-zircon-sys 0.3.3 # BSD-3-Clause
MODCARGO_CRATES += itoa 0.4.2 # MIT/Apache-2.0
MODCARGO_CRATES += lazy_static 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.43 # MIT/Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT/Apache-2.0
MODCARGO_CRATES += lock_api 0.1.3 # Apache-2.0/MIT
MODCARGO_CRATES += log 0.4.5 # MIT/Apache-2.0
MODCARGO_CRATES += memchr 2.0.2 # Unlicense/MIT
blob - 99accb78015c18170bfe1b194b88bcf556ed594b
blob + b388cfaad6cd92fb465c2c6335f550bc995b7e7e
--- textproc/ripgrep/distinfo
+++ textproc/ripgrep/distinfo
@@ -20,7 +20,7 @@ SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = Pcqpr
SHA256 (cargo/glob-0.2.11.tar.gz) =
i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s=
SHA256 (cargo/itoa-0.4.2.tar.gz) = WttYVY3NHXhrXwvRXzIm7iNIbiS3tYMEtg9k3GjmJgY=
SHA256 (cargo/lazy_static-1.1.0.tar.gz) =
ykiLiaVlewouzUW5Vgmz6EjPF1XaMyoNpG4rKxyzcac=
-SHA256 (cargo/libc-0.2.43.tar.gz) =
duOj7xcvGguan/DdFJGuXmyUi5RHmjAhgZun2GDIZF0=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/lock_api-0.1.3.tar.gz) =
lJgmpczxjBs6fD1XaSd40hdot55G653Qe/xMIWADbFQ=
SHA256 (cargo/log-0.4.5.tar.gz) = 1PzOX6ScxpPDEgAdrx0TQRxKUoN5a6wQhCmeo+VnET8=
SHA256 (cargo/memchr-2.0.2.tar.gz) =
o7QUKrhzinjFGJb3BPg8Ed8Ef/G9qakqZhqmNhVS2T0=
@@ -97,7 +97,7 @@ SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
SIZE (cargo/glob-0.2.11.tar.gz) = 18065
SIZE (cargo/itoa-0.4.2.tar.gz) = 10581
SIZE (cargo/lazy_static-1.1.0.tar.gz) = 12317
-SIZE (cargo/libc-0.2.43.tar.gz) = 353810
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/lock_api-0.1.3.tar.gz) = 12167
SIZE (cargo/log-0.4.5.tar.gz) = 22221
SIZE (cargo/memchr-2.0.2.tar.gz) = 10092
blob - ad454371ef4b568e5da02556a97babf9b2b6c026
blob + 06df38458dcda6d982dd19ea6d07f60ee26e6d8e
--- www/geckodriver/Makefile
+++ www/geckodriver/Makefile
@@ -20,6 +20,8 @@ MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += adler32 1.0.3 # BSD-3-Clause AND Zlib
MODCARGO_CRATES += aho-corasick 0.6.8 # Unlicense/MIT
MODCARGO_CRATES += arrayvec 0.4.7 # MIT/Apache-2.0
@@ -57,7 +59,7 @@ MODCARGO_CRATES += itoa 0.4.3 # MIT/Apache-2.0
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.1.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.43 # MIT/Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT/Apache-2.0
MODCARGO_CRATES += lock_api 0.1.3 # Apache-2.0/MIT
MODCARGO_CRATES += log 0.4.5 # MIT/Apache-2.0
MODCARGO_CRATES += mio 0.6.16 # MIT
blob - 04c62c776ecfa4148704ff2776788849613f3cfb
blob + b094eebf8edeb211a032b14458ccaa0b717eb200
--- www/geckodriver/distinfo
+++ www/geckodriver/distinfo
@@ -35,7 +35,7 @@ SHA256 (cargo/itoa-0.4.3.tar.gz) = EwbzRklR8w4w0SNz0xx
SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) =
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
SHA256 (cargo/lazy_static-1.1.0.tar.gz) =
ykiLiaVlewouzUW5Vgmz6EjPF1XaMyoNpG4rKxyzcac=
SHA256 (cargo/lazycell-1.1.0.tar.gz) =
4m1MQRs58K/PK6b+UCvpDmybKZyVLb2GEkeCUgoTz/0=
-SHA256 (cargo/libc-0.2.43.tar.gz) =
duOj7xcvGguan/DdFJGuXmyUi5RHmjAhgZun2GDIZF0=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/lock_api-0.1.3.tar.gz) =
lJgmpczxjBs6fD1XaSd40hdot55G653Qe/xMIWADbFQ=
SHA256 (cargo/log-0.4.5.tar.gz) = 1PzOX6ScxpPDEgAdrx0TQRxKUoN5a6wQhCmeo+VnET8=
SHA256 (cargo/matches-0.1.8.tar.gz) =
f/xcUzhGnU0+oX0mn6jqNRKtJHJHwwvS32nmgwntCgg=
@@ -169,7 +169,7 @@ SIZE (cargo/itoa-0.4.3.tar.gz) = 11061
SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
SIZE (cargo/lazy_static-1.1.0.tar.gz) = 12317
SIZE (cargo/lazycell-1.1.0.tar.gz) = 11027
-SIZE (cargo/libc-0.2.43.tar.gz) = 353810
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/lock_api-0.1.3.tar.gz) = 12167
SIZE (cargo/log-0.4.5.tar.gz) = 22221
SIZE (cargo/matches-0.1.8.tar.gz) = 2216
blob - 0d077b6b0654dcf4b844c49d62496aa7b3437359
blob + 860bd757d7603a72f489ce144a88f637796802bf
--- www/newsboat/Makefile
+++ www/newsboat/Makefile
@@ -31,6 +31,8 @@ MODCARGO_BUILD = No
MODCARGO_INSTALL = No
MODCARGO_TEST = No
+MODCARGO_CRATES_UPDATE += libc
+
MODCARGO_CRATES += aho-corasick 0.6.9 # Unlicense/MIT
MODCARGO_CRATES += argon2rs 0.2.5 # MIT
MODCARGO_CRATES += arrayvec 0.4.10 # MIT/Apache-2.0
@@ -50,7 +52,7 @@ MODCARGO_CRATES += failure_derive 0.1.5 # MIT OR Apach
MODCARGO_CRATES += fuchsia-cprng 0.1.1 # LICENSE
MODCARGO_CRATES += idna 0.1.5 # MIT/Apache-2.0
MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.48 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += lock_api 0.1.5 # Apache-2.0/MIT
MODCARGO_CRATES += matches 0.1.8 # MIT
MODCARGO_CRATES += memchr 2.1.3 # Unlicense/MIT
blob - e2ad8960c0f38a84cf1fb8f8a7ecb70d9c5836e3
blob + 750dc6d296ec74ac11e0d4f26588c111269c3ba3
--- www/newsboat/distinfo
+++ www/newsboat/distinfo
@@ -17,7 +17,7 @@ SHA256 (cargo/failure_derive-0.1.5.tar.gz) = 6hBjkV/X7
SHA256 (cargo/fuchsia-cprng-0.1.1.tar.gz) =
oG931SbBpgG3xM3Zj1S16qv/wU1fLwKW/r3H81fG07o=
SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeDwsftV/e4fF0cK2ADad69RhqGnbAJrZ5NYt+hE4=
SHA256 (cargo/lazy_static-1.2.0.tar.gz) =
o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE=
-SHA256 (cargo/libc-0.2.48.tar.gz) =
6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc=
+SHA256 (cargo/libc-0.2.63.tar.gz) =
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
SHA256 (cargo/lock_api-0.1.5.tar.gz) =
YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw=
SHA256 (cargo/matches-0.1.8.tar.gz) =
f/xcUzhGnU0+oX0mn6jqNRKtJHJHwwvS32nmgwntCgg=
SHA256 (cargo/memchr-2.1.3.tar.gz) =
4d1OqsKYwyzgfrbtkkLtp9gpVbkXC31ttZsuAsxj/Lg=
@@ -92,7 +92,7 @@ SIZE (cargo/failure_derive-0.1.5.tar.gz) = 4884
SIZE (cargo/fuchsia-cprng-0.1.1.tar.gz) = 2950
SIZE (cargo/idna-0.1.5.tar.gz) = 258735
SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840
-SIZE (cargo/libc-0.2.48.tar.gz) = 353045
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967
SIZE (cargo/matches-0.1.8.tar.gz) = 2216
SIZE (cargo/memchr-2.1.3.tar.gz) = 20069
blob - c98abe131e293df38fc756ccda21796d1e139715
blob + fcb5423c0e73ca22cfc1bbef5183d359e60d6855
--- x11/gnome/librsvg/Makefile
+++ x11/gnome/librsvg/Makefile
@@ -21,6 +21,7 @@ BUILD_DEPENDS= lang/rust
PKG_ARGS= -Dold=0 -Dstable=1
MAKE_ENV+= CARGO_BUILD_JOBS=${MAKE_JOBS} \
CARGO_HOME=${WRKBUILD}/cargo-home
+COMPILER= base-clang ports-gcc
.else
### old
REVISION= 3
@@ -55,6 +56,11 @@ CONFIGURE_ARGS= --disable-tools
# error: -Bsymbolic-functions requested but not supported by ld
CONFIGURE_ARGS += --disable-Bsymbolic
+
+post-patch:
+ # permit patching libc-rs to support sparc64 (could be removed with
libc>=0.2.63)
+ -sed -i 's/"files":{[^}]*}/"files":{}/' \
+ ${WRKSRC}/vendor/libc/.cargo-checksum.json
post-install:
rm ${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.{a,la}
blob - /dev/null
blob + 7e667e815f3dd133da1f2b60994ed90c6844c812
--- /dev/null
+++
x11/gnome/librsvg/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs
@@ -0,0 +1,18 @@
+$OpenBSD$
+add minimal sparc64 support
+could be removed with libc>=0.2.63
+Index: vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+--- vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs.orig
++++ vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+@@ -273,6 +273,11 @@ cfg_if! {
+ } else if #[cfg(target_arch = "aarch64")] {
+ mod aarch64;
+ pub use self::aarch64::*;
++ } else if #[cfg(target_arch = "sparc64")] {
++ pub type c_long = i64;
++ pub type c_ulong = u64;
++ pub type c_char = i8;
++ pub const _ALIGNBYTES: usize = 0xf;
+ } else {
+ // Unknown target_arch
+ }
