Commit 2cc214b4 authored by Audrey Dutcher's avatar Audrey Dutcher Committed by John Ericson
Browse files

freebsd: 13.1.0 -> 14.0.0 



The old patches are kept because the version is actually configurable.
In the future both versions may be exposed.

Co-Auhtored-By: default avatarArtemis Tosini <me@artem.ist>
Co-Authored-by: default avatarJohn Ericson <John.Ericson@Obsidian.Systems>
parent 06b05d22

pkgs/os-specific/bsd/freebsd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  callPackage,

  crossLibcStdenv,

  attributePathToSplice ? [ "freebsd" ],

  branch ? "release/13.1.0",

  branch ? "release/14.0.0",

}:



let

pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/share/mk/src.libnames.mk	2023-12-21 23:56:50.767042385 -0800

+++ b/share/mk/src.libnames.mk	2023-12-21 23:56:39.671089506 -0800

@@ -392,7 +392,7 @@

 _DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp

 # The libc dependencies are not strictly needed but are defined to make the

 # assert happy.

-_DP_c=		compiler_rt

+_DP_c=		

 # Use libssp_nonshared only on i386 and power*.  Other archs emit direct calls

 # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared.

 .if ${MK_SSP} != "no" && \

pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch

0 → 100644
+32 −0
Original line number Diff line number Diff line 
--- a/tools/build/cross-build/include/common/sys/_types.h

+++ b/tools/build/cross-build/include/common/sys/_types.h

@@ -47,3 +47,6 @@

  * Neither GLibc nor macOS define __va_list but many FreeBSD headers require it.

  */

 typedef __builtin_va_list __va_list;

+

+typedef __UINTPTR_TYPE__ __uintptr_t;

+typedef __INTPTR_TYPE__ __intptr_t;

--- a/tools/build/cross-build/include/common/sys/types.h

+++ b/tools/build/cross-build/include/common/sys/types.h

@@ -49,9 +49,6 @@

 #include <sys/sysmacros.h>

 #endif

 

-typedef __UINTPTR_TYPE__ __uintptr_t;

-typedef __INTPTR_TYPE__ __intptr_t;

-

 /* needed for gencat */

 typedef int __nl_item;

 

--- a/tools/build/cross-build/include/linux/sys/types.h

+++ b/tools/build/cross-build/include/linux/sys/types.h

@@ -39,6 +39,8 @@

 

 #include_next <sys/types.h>

 

+#include <sys/_types.h>

+

 #ifndef __size_t

 typedef __SIZE_TYPE__ __size_t;

 #endif

pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
diff --git a/tools/build/Makefile b/tools/build/Makefile

index 948a5f9dfdb..592af84eeae 100644

--- a/tools/build/Makefile

+++ b/tools/build/Makefile

@@ -327,14 +327,14 @@ host-symlinks:

 # and cross-tools stages. We do this here using mkdir since mtree may not exist

 # yet (this happens if we are crossbuilding from Linux/Mac).

 INSTALLDIR_LIST= \

-	bin \

-	lib/geom \

-	usr/include/casper \

-	usr/include/private/ucl \

-	usr/include/private/zstd \

-	usr/lib \

-	usr/libdata/pkgconfig \

-	usr/libexec

+	${BINDIR} \

+	${LIBDIR}/geom \

+	${INCLUDEDIR}/casper \

+	${INCLUDEDIR}/private/ucl \

+	${INCLUDEDIR}/private/zstd \

+	${LIBDIR} \

+	${LIBDIR}/libdata/pkgconfig \

+	${LIBEXECDIR}

 

 installdirs:

 	mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}

@@ -352,9 +352,9 @@ installdirs:

 	    rm -rf "${DESTDIR}/${_dir}"; \

 	fi

 .endfor

-	ln -sfn bin ${DESTDIR}/sbin

-	ln -sfn ../bin ${DESTDIR}/usr/bin

-	ln -sfn ../bin ${DESTDIR}/usr/sbin

+	ln -sfn bin ${DESTDIR}/${SBINDIR}

+	ln -sfn ../bin ${DESTDIR}/${BINDIR}

+	ln -sfn ../bin ${DESTDIR}/${SBINDIR}

 .for _group in ${INCSGROUPS:NINCS}

 	mkdir -p "${DESTDIR}/${${_group}DIR}"

 .endfor

pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/usr.bin/xinstall/Makefile	2023-09-23 19:18:49.165192183 -0700

+++ b/usr.bin/xinstall/Makefile	2023-12-06 17:06:57.836888028 -0700

@@ -14,7 +14,7 @@

 CFLAGS+=	-I${SRCTOP}/lib/libnetbsd

 

 LIBADD=		md

-CFLAGS+=	-DWITH_MD5 -DWITH_RIPEMD160

+CFLAGS+=		-I${BSDSRCDIR}/contrib/libc-vis -I${BSDSRCDIR}/lib/libnetbsd

 

 .ifdef BOOTSTRAPPING

 # For the bootstrap we disable copy_file_range()