Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b633e1b3d40f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0eb50232787
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 15, 2018

  1. Enable cross compilation for cpython 2.7 (#50245)

    @tathougies @FRidh
    tathougies authored and FRidh committed Nov 15, 2018
    Copy the full SHA
    d0eb502 View commit details
Showing with 40 additions and 2 deletions.
  1. +32 −0 pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
  2. +8 −2 pkgs/development/interpreters/python/cpython/2.7/default.nix
32 changes: 32 additions & 0 deletions pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--- ./setup.py.orig 2018-04-29 15:47:33.000000000 -0700
+++ ./setup.py 2018-11-11 09:41:58.097682221 -0800
@@ -458,8 +458,6 @@
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- if cross_compiling:
- self.add_gcc_paths()
self.add_multiarch_paths()

# Add paths specified in the environment variables LDFLAGS and
@@ -517,7 +515,10 @@
# be assumed that no additional -I,-L directives are needed.
inc_dirs = self.compiler.include_dirs[:]
lib_dirs = self.compiler.library_dirs[:]
- if not cross_compiling:
+ if cross_compiling:
+ inc_dirs = []
+ lib_dirs = []
+ else:
for d in (
'/usr/include',
):
@@ -582,6 +584,8 @@ class PyBuildExt(build_ext):
# Some modules that are normally always on:
#exts.append( Extension('_weakref', ['_weakref.c']) )

+ self.compiler.library_dirs = lib_dirs + [ '.' ]
+
# array objects
exts.append( Extension('array', ['arraymodule.c']) )

10 changes: 8 additions & 2 deletions pkgs/development/interpreters/python/cpython/2.7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -104,6 +104,8 @@ let
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
./python-2.7-distutils-C++.patch
] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [
./cross-compile.patch
];

preConfigure = ''
@@ -176,10 +178,14 @@ let
LIBRARY_PATH = makeLibraryPath paths;
};

# Python 2.7 needs this
crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
{ _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };

# Build the basic Python interpreter without modules that have
# external dependencies.

in stdenv.mkDerivation {
in stdenv.mkDerivation ({
name = "python-${version}";
pythonVersion = majorVersion;

@@ -278,4 +284,4 @@ in stdenv.mkDerivation {
# in case both 2 and 3 are installed.
priority = -100;
};
}
} // crossCompileEnv)