Attachment #247014 for bug #274743

Lines 22-41 LICENSE_COMB= dual Link Here

(-)Makefile (-4 / +18 lines)
22	LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE	22	LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
23	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT	23	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
24		24
		25	EXTRACT_AFTER_ARGS= --exclude libssh2 --exclude libgit2 \
		26	--exclude nghttp2 --exclude curl-sys/curl \
		27	--exclude include/curl --exclude "curl-sys-*/curl" \
		28	--exclude openssl-src/openssl \
		29	--exclude "libz-sys/src/libz*"
		30
25	IGNORE_FreeBSD_12_powerpc= is missing a bootstrap for FreeBSD 12.x powerpc	31	IGNORE_FreeBSD_12_powerpc= is missing a bootstrap for FreeBSD 12.x powerpc
26	ONLY_FOR_ARCHS?= aarch64 amd64 armv7 i386 powerpc64 powerpc64le powerpc \	32	ONLY_FOR_ARCHS?= aarch64 amd64 armv7 i386 powerpc64 powerpc64le powerpc \
27	riscv64	33	riscv64
28	ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler	34	ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler
29		35
30	BUILD_DEPENDS= cmake:devel/cmake-core	36	BUILD_DEPENDS= cmake:devel/cmake-core
31	LIB_DEPENDS= libcurl.so:ftp/curl	37	LIB_DEPENDS= libcurl.so:ftp/curl \
		38	libgit2.so:devel/libgit2 \
		39	libssh2.so:security/libssh2
32		40
33	USES= cpe ninja:build pkgconfig python:build ssl tar:xz	41	USES= cpe localbase ninja:build pkgconfig python:build ssl tar:xz
34		42
35	CPE_VENDOR= rust-lang	43	CPE_VENDOR= rust-lang
36		44
37	MAKE_ENV= DESTDIR=${STAGEDIR} \	45	MAKE_ENV= DESTDIR=${STAGEDIR} \
38	LIBGIT2_NO_PKG_CONFIG=1 \	46	LIBSSH2_SYS_USE_PKG_CONFIG=yes \
		47	LIBGIT2_NO_VENDOR=1 \
39	OPENSSL_DIR="${OPENSSLBASE}"	48	OPENSSL_DIR="${OPENSSLBASE}"
40	TEST_ENV= ${MAKE_ENV} \	49	TEST_ENV= ${MAKE_ENV} \
41	ALLOW_NONZERO_RLIMIT_CORE=1	50	ALLOW_NONZERO_RLIMIT_CORE=1
Lines 100-108 _COMPONENTS+= cargo-${_PACKAGE_VERS}-${_RUST_TARGET} \ Link Here
100	IGNORE= is only for FreeBSD	109	IGNORE= is only for FreeBSD
101	.endif	110	.endif
102		111
		112	.if ${PORT_OPTIONS:MPORT_LLVM}
		113	# We still must have llvm-project/libunwind at this time:
		114	EXTRACT_AFTER_ARGS+= --exclude llvm-project/ll* --exclude llvm-project/c* --exclude llvm-project/r*
		115	.endif
		116
103	.if ${ARCH} == powerpc	117	.if ${ARCH} == powerpc
104	LIB_DEPENDS+= libatomic.so:lang/gcc${GCC_DEFAULT}	118	LIB_DEPENDS+= libatomic.so:lang/gcc${GCC_DEFAULT}
105	MAKE_ENV+= RUSTFLAGS="-L/usr/local/lib/gcc${GCC_DEFAULT}"	119	MAKE_ENV+= RUSTFLAGS="-L${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
106	.else	120	.else
107	MAKE_ENV+= RUST_BACKTRACE=1	121	MAKE_ENV+= RUST_BACKTRACE=1
108	.endif	122	.endif




Whether to use the already installd lzma is determined based
on pkg-config. On FreeBSD that detection fails, because lzma
is part of the base OS. Use system -llzma unconditionally...

	-mi

--- vendor/lzma-sys/build.rs	2023-12-04 16:32:19.000000000 -0500
+++ vendor/lzma-sys/build.rs	2023-12-11 18:09:40.320258000 -0500
@@ -19,5 +19,5 @@
     // Otherwise check the system to see if it has an lzma library already
     // installed that we can use.
-    if !want_static && !msvc && pkg_config::probe_library("liblzma").is_ok() {
+    if !want_static && !msvc {
         return;
     }

Added Link Here

(-)files/patch-sys-nghttp2 (+8 lines)
1	--- vendor/libnghttp2-sys/build.rs 2023-12-04 16:32:19.000000000 -0500
2	+++ vendor/libnghttp2-sys/build.rs 2023-12-12 15:18:42.431611000 -0500
3	@@ -6,4 +6,5 @@
4
5	fn main() {
6	+ return;
7	let target = env::var("TARGET").unwrap();
8	let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());

Return to bug 274743

Added Link Here

(-)files/patch-sys-lzma (+15 lines)
1	Whether to use the already installd lzma is determined based
2	on pkg-config. On FreeBSD that detection fails, because lzma
3	is part of the base OS. Use system -llzma unconditionally...
4
5	-mi
6
7	--- vendor/lzma-sys/build.rs 2023-12-04 16:32:19.000000000 -0500
8	+++ vendor/lzma-sys/build.rs 2023-12-11 18:09:40.320258000 -0500
9	@@ -19,5 +19,5 @@
10	// Otherwise check the system to see if it has an lzma library already
11	// installed that we can use.
12	- if !want_static && !msvc && pkg_config::probe_library("liblzma").is_ok() {
13	+ if !want_static && !msvc {
14	return;
15	}