Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3: add support for netbsd #344157

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
--- a/configure.ac 2024-06-07 09:17:50.608162031 -0700
+++ b/configure.ac 2024-06-07 09:45:59.844518241 -0700
@@ -554,6 +554,9 @@
diff --git a/configure.ac b/configure.ac
index d0d5405028..143e8ddfd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -559,6 +559,12 @@ then
*-*-wasi)
ac_sys_system=WASI
;;
+ *-*-freebsd)
+ ac_sys_system=FreeBSD
+ ;;
+ *-*-netbsd)
+ ac_sys_system=NetBSD
+ ;;
*)
# for now, limit cross builds to known configurations
MACHDEP="unknown"
@@ -614,6 +617,9 @@
@@ -619,6 +625,9 @@ if test "$cross_compiling" = yes; then
wasm32-*-* | wasm64-*-*)
_host_cpu=$host_cpu
;;
+ x86_64-*-freebsd)
+ x86_64-*-freebsd|x86_64-*-netbsd)
+ _host_cpu=x86_64
+ ;;
*)
# for now, limit cross builds to known configurations
MACHDEP="unknown"

6 changes: 3 additions & 3 deletions pkgs/development/interpreters/python/cpython/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
# (since it will do a futile invocation of gcc (!) to find
# libuuid, slowing down program startup a lot).
noldconfigPatch
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && (stdenv.isFreeBSD || stdenv.hostPlatform.isNetBSD)) [
# Cross compilation only supports a limited number of "known good"
# configurations. If you're reading this and it's been a long time
# since this diff, consider submitting this patch upstream!
./freebsd-cross.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also made a PR for cpython + freebsd here: python/cpython#124424

./bsd-cross.patch
] ++ optionals (pythonOlder "3.13") [
# Make sure that the virtualenv activation scripts are
# owner-writable, so venvs can be recreated without permission
Expand Down Expand Up @@ -684,7 +684,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'';
license = licenses.psfl;
pkgConfigModules = [ "python3" ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd ++ platforms.netbsd;
mainProgram = executable;
};
})