CVS commit: pkgsrc/lang/rust

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jun 19 14:46:47 UTC 2023

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
Added Files:
        pkgsrc/lang/rust/patches:
            patch-vendor_openssl-sys_build_find__normal.rs

Log Message:
rust: fix build on Darwin if Homebrew is installed

The openssl-sys crate has a misguided piece of logic to prefer any
Homebrew tree to the usual place for finding OpenSSL. Remove this code
so that Rust actually uses pkgsrc OpenSSL as it should.

In particular, if you have Apple Game Porting toolkit installed, you get
a Homebrew installation for x86_64 on an ARM machine, which can never work.

OK during freeze adam@, wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.158 -r1.159 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.283 pkgsrc/lang/rust/Makefile:1.284
--- pkgsrc/lang/rust/Makefile:1.283     Tue Jun  6 12:41:46 2023
+++ pkgsrc/lang/rust/Makefile   Mon Jun 19 14:46:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.283 2023/06/06 12:41:46 riastradh Exp $
+# $NetBSD: Makefile,v 1.284 2023/06/19 14:46:47 bsiegert Exp $
 
 DISTNAME=      rustc-1.69.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -463,6 +463,8 @@ CKSUMS+=    db49cdc41015692a4dd2076a33d694c
 CKSUM_CRATES+= vendor/openssl-sys
 CKSUMS+=       d397af804c0b786978867528635fa9148cd2ad0e6abd591ace21b5bd3719c38d
 CKSUMS+=       246d1f71852a08745fba8d00f126d2bd7816c9428d568a0d5e4907e69548ab9b
+CKSUMS+=       5b3f48d529657f212e69883f9d3f599d0e1fc9a64f1389cc3760029b4ad6a423
+CKSUMS+=       ab6b0ec78a2eefeaf0fc5f45afa783fa254d5efe856401c0b34d4d05ef9b3dd4
 
 CKSUM_CRATES+= vendor/nix
 CKSUMS+=       c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.158 pkgsrc/lang/rust/distinfo:1.159
--- pkgsrc/lang/rust/distinfo:1.158     Wed May  3 22:39:09 2023
+++ pkgsrc/lang/rust/distinfo   Mon Jun 19 14:46:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.158 2023/05/03 22:39:09 he Exp $
+$NetBSD: distinfo,v 1.159 2023/06/19 14:46:47 bsiegert Exp $
 
 BLAKE2s (rust-1.68.2-aarch64-apple-darwin.tar.gz) = 2ce1385b1966325074f41065a834f57621c641335ccc1b011543deaa15758430
 SHA512 (rust-1.68.2-aarch64-apple-darwin.tar.gz) = 9525012c5fd8f2fcf498b79b698a74655a4520c18d369762acfdd7e7eb899e0793ce620630a18fc4a0840f0b7faa6e5e082398ec0c41967199f3344c6a8bc3ef
@@ -157,6 +157,7 @@ SHA1 (patch-vendor_lzma-sys_config.h) = 
 SHA1 (patch-vendor_nix_src_sys_signal.rs) = bf4fcdc5b71d8d73b3d7e8acfccd0554d822c131
 SHA1 (patch-vendor_openssl-src_openssl_Configurations_10-main.conf) = 1c4e1d5520776e70d588f3da0fd54b6f956835b5
 SHA1 (patch-vendor_openssl-src_src_lib.rs) = 918fac850f3a6e948d25ef3f673ef62345de386f
+SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 8c4311cdd2bd66882fa8406e28119a0144df5301
 SHA1 (patch-vendor_openssl-sys_build_main.rs) = 3924efda02e7d8e2115db55b84a7dcc9756e365c
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e

Added files:

Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs:1.1
--- /dev/null   Mon Jun 19 14:46:47 2023
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs     Mon Jun 19 14:46:47 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-vendor_openssl-sys_build_find__normal.rs,v 1.1 2023/06/19 14:46:47 bsiegert Exp $
+
+--- vendor/openssl-sys/build/find_normal.rs.orig       2023-05-31 21:44:49.000000000 +0000
++++ vendor/openssl-sys/build/find_normal.rs
+@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
+ fn find_openssl_dir(target: &str) -> OsString {
+     let host = env::var("HOST").unwrap();
+ 
+-    if host == target && target.ends_with("-apple-darwin") {
+-        let homebrew_dir = match target {
+-            "aarch64-apple-darwin" => "/opt/homebrew",
+-            _ => "/usr/local",
+-        };
+-
+-        if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
+-            return dir.into();
+-        } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
+-            // pkgsrc
+-            return dir.into();
+-        } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
+-            // MacPorts
+-            return dir.into();
+-        }
+-    }
+-
+     try_pkg_config();
+     try_vcpkg();
+