From nobody Sat Nov 26 00:09:51 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NJsYW6rn7z4hpw7; Sat, 26 Nov 2022 00:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NJsYW6LDqz3qJ8; Sat, 26 Nov 2022 00:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669421391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOkk8uRG1zN0kG3i5L9xnNEoGBOq402ZkPO2i4xEA0E=; b=Ck+s2kwTsfGGvmQ9rfjfZqeZwmozVuQN99KAAL6bBE+uQjgUNxA6RJQxzZI4We6A+zVF6n CN+nxOIi2wsStktj47ebpqKibLB+WBS92GTv6yVi9YhVEm7/HPrhCYCk8z4wmJqFQjkS9m FQ17V+1th0Dw2VhhuvmkBooaL77c3Uz9NfJN4lYfUzyRhDwTHzvgNB3Ns6WwM/Tuq11XcK +k3fpwIyrvLINaFWDUd3E7F0AW6ZLrXc95SNIDZmlpMdehqy0QnG199xZcM5MYq3QuIo3o vnd02nD3agwylO6/wORAyqbAxISm8E+MbTRHWyk/WbvGxx6U2hIX3fLc48+v1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669421391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOkk8uRG1zN0kG3i5L9xnNEoGBOq402ZkPO2i4xEA0E=; b=qmM82QcoBERHLStaiO3oNJP/iymOxn3oTpH3dfLGW6Q0Bt/nve1bYgt1ErdoJ4x2UoV7KP dg4njwM8bEJz6Y1SnfXYvCA/Bw4k0OG61/t/Ke1DOxlRZXDhva3bpZQdUfPvr66KbVpIis /E+ovoNH+/ruudMRC7zA2Mst97rfSOT6A9JQ4TeqdB1twGoSIyp8qyvZ6V0N9AL0EEY0hI kEoV0wh3k2ELSeBWhm9nyz+MMfIPB73dxe3DzCK4tQpgMSWJuurGFTsC3Fjh5IAV9LFWS2 mN9V6AuCA7FClslh2DaCE2mbxSIoxfELkrYUVQEv7lzZCO+4mtpvuPXLgY6nAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669421391; a=rsa-sha256; cv=none; b=aQg5vkMPF29IvvMHq+qxp9FWEiwUop+idWFxJncGNmQK+cTVDvVLnUax1XzQeP59FcEFvs 3z9RCdVTgSrRiZQ/7w6CRFafSrcD+FLqu/JXIg5/sLveMD4JodHRHnsCLYqufQKUWcJ3EA 6wb56Dha8kesLH1R58/EkriZ2ba/Ryuo2Gj818ijUAyw1XQ25ZeYWo7QpWrXKWT2OtD42I ATWib9Vmkuqp8SzdPDReRa3K2ulLH+mDFf0bgeba3oI44tKMtEZZOm8SkHFt8PrpwiWwXT E5VBgf60Oasjf4tPl3fAicbAXMlmXNBXBXaRvxXDL1fZ8XDugc78hRzIm3bROA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NJsYW5FtGz10SL; Sat, 26 Nov 2022 00:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AQ09pna020852; Sat, 26 Nov 2022 00:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AQ09pDQ020850; Sat, 26 Nov 2022 00:09:51 GMT (envelope-from git) Date: Sat, 26 Nov 2022 00:09:51 GMT Message-Id: <202211260009.2AQ09pDQ020850@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: d5e92a6ee45c - main - lang/rust: don't link to libatomic on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5e92a6ee45c44a0fb52cbba968d5d38b4279757 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5e92a6ee45c44a0fb52cbba968d5d38b4279757 commit d5e92a6ee45c44a0fb52cbba968d5d38b4279757 Author: Piotr Kubaj AuthorDate: 2022-11-26 00:03:15 +0000 Commit: Piotr Kubaj CommitDate: 2022-11-26 00:09:41 +0000 lang/rust: don't link to libatomic on armv7 Reported by: mikael --- lang/rust/Makefile | 7 ++----- lang/rust/files/patch-compiler_rustc__llvm_build.rs | 18 +++--------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 48abb4cb624f..19b7cc66e748 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -111,13 +111,10 @@ IGNORE= is only for FreeBSD .if ${ARCH} == powerpc # bfd to link rustc_driver; lld currently can't BUILD_DEPENDS+= ld.bfd:devel/binutils -.else -MAKE_ENV+= RUST_BACKTRACE=1 -.endif - -.if ${ARCH} == armv7 || ${ARCH} == powerpc LIB_DEPENDS+= libatomic.so:lang/gcc${GCC_DEFAULT} MAKE_ENV+= RUSTFLAGS="-L/usr/local/lib/gcc${GCC_DEFAULT}" +.else +MAKE_ENV+= RUST_BACKTRACE=1 .endif # rls doesn't build on rust nightly diff --git a/lang/rust/files/patch-compiler_rustc__llvm_build.rs b/lang/rust/files/patch-compiler_rustc__llvm_build.rs index 4509c7b9d54c..8ed4577c223a 100644 --- a/lang/rust/files/patch-compiler_rustc__llvm_build.rs +++ b/lang/rust/files/patch-compiler_rustc__llvm_build.rs @@ -1,18 +1,6 @@ -From cbeec86a5594ef6ca36d0ea24b4cb7e3dbaded87 Mon Sep 17 00:00:00 2001 -From: pkubaj -Date: Fri, 18 Nov 2022 12:36:49 +0000 -Subject: [PATCH] Fix build on powerpc-unknown-freebsd - -Probably also fixes build on arm and mips*. Related to https://github.com/rust-lang/rust/issues/104220 ---- - compiler/rustc_llvm/build.rs | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs -index d35e4191cc0b1..afdf9ac8883e9 100644 --- compiler/rustc_llvm/build.rs +++ compiler/rustc_llvm/build.rs -@@ -237,18 +237,21 @@ fn main() { +@@ -237,18 +237,20 @@ if !is_crossed { cmd.arg("--system-libs"); @@ -22,10 +10,10 @@ index d35e4191cc0b1..afdf9ac8883e9 100644 - } else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") { - println!("cargo:rustc-link-lib=z"); - } else if target.starts_with("arm") +- || target.starts_with("mips-") + } + -+ if target.starts_with("arm") - || target.starts_with("mips-") ++ if target.starts_with("mips") || target.starts_with("mipsel-") || target.starts_with("powerpc-") {