diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-15 00:25:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-29 22:59:28 +0100 |
| commit | 9820a6d4a0fb82cd97f62ada764af658a4a3e71d (patch) | |
| tree | 610cf1eed4ca9a2ba2864ef362ba106ac0042fbd | |
| parent | a665996f58764a0c6e805016915225f911294989 (diff) | |
| download | guix-9820a6d4a0fb82cd97f62ada764af658a4a3e71d.tar guix-9820a6d4a0fb82cd97f62ada764af658a4a3e71d.tar.gz | |
gnu: python: Make 'sys.version' deterministic.
* gnu/packages/patches/python-2-deterministic-build-info.patch,
gnu/packages/patches/python-3-deterministic-build-info.patch: New
files.
* gnu/packages/python.scm (python-2, python): Use them.
* gnu-system.am (dist_patch_DATA): Add them.
| -rw-r--r-- | gnu-system.am | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/python-2-deterministic-build-info.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/patches/python-3-deterministic-build-info.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 2 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index c7a17a42e9..71b914442f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -669,8 +669,10 @@ dist_patch_DATA = \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ + gnu/packages/patches/python-2-deterministic-build-info.patch \ gnu/packages/patches/python-2.7-search-paths.patch \ gnu/packages/patches/python-2.7-source-date-epoch.patch \ + gnu/packages/patches/python-3-deterministic-build-info.patch \ gnu/packages/patches/python-3-search-paths.patch \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-2-deterministic-build-info.patch b/gnu/packages/patches/python-2-deterministic-build-info.patch new file mode 100644 index 0000000000..25a079fe90 --- /dev/null +++ b/gnu/packages/patches/python-2-deterministic-build-info.patch @@ -0,0 +1,17 @@ +Always provide the same date and time in 'Py_GetBuildInfo'. +This is the information shown at the REPL and in 'sys.version'. +We cannot pass it in CPPFLAGS due to whitespace in the DATE string. + +--- a/Modules/getbuildinfo.c ++++ b/Modules/getbuildinfo.c +@@ -4,6 +4,10 @@ + #include <stdio.h> + #endif + ++/* Deterministic date and time. */ ++#define DATE "Jan 1 1970" ++#define TIME "00:00:01" ++ + #ifndef DATE + #ifdef __DATE__ + #define DATE __DATE__ diff --git a/gnu/packages/patches/python-3-deterministic-build-info.patch b/gnu/packages/patches/python-3-deterministic-build-info.patch new file mode 100644 index 0000000000..22c372a0cf --- /dev/null +++ b/gnu/packages/patches/python-3-deterministic-build-info.patch @@ -0,0 +1,17 @@ +Always provide the same date and time in 'Py_GetBuildInfo'. +This is the information shown at the REPL and in 'sys.version'. +We cannot pass it in CPPFLAGS due to whitespace in the DATE string. + +--- Modules/getbuildinfo.c ++++ Modules/getbuildinfo.c +@@ -4,6 +4,10 @@ + #include <stdio.h> + #endif + ++/* Deterministic date and time. */ ++#define DATE "Jan 1 1970" ++#define TIME "00:00:01" ++ + #ifndef DATE + #ifdef __DATE__ + #define DATE __DATE__ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7f7fa388a1..fa8f203828 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -94,6 +94,7 @@ "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")) (patches (map search-patch '("python-2.7-search-paths.patch" + "python-2-deterministic-build-info.patch" "python-2.7-source-date-epoch.patch"))))) (build-system gnu-build-system) (arguments @@ -223,6 +224,7 @@ data types.") '("python-fix-tests.patch" ;; XXX Try removing this patch for python > 3.4.3 "python-disable-ssl-test.patch" + "python-3-deterministic-build-info.patch" "python-3-search-paths.patch"))) (patch-flags '("-p0")) (sha256 |