Compare commits
7 Commits
master
...
f27-modula
Author | SHA1 | Date | |
---|---|---|---|
|
c61ec4378a | ||
|
4704498937 | ||
|
851697dc0e | ||
|
df43cbbde3 | ||
|
af5fb68888 | ||
|
270c6e750f | ||
|
9b45e76f34 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
/*.tar.*
|
/*.tar.*
|
||||||
/*.src.rpm
|
|
||||||
/results_python3*
|
|
||||||
|
@ -1,18 +1,7 @@
|
|||||||
From bf01d6c367d9cb8f6594afa87c16f0498ae7321f Mon Sep 17 00:00:00 2001
|
diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
|
||||||
From: David Malcolm <dmalcolm@redhat.com>
|
--- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath 2009-09-04 17:29:34.000000000 -0400
|
||||||
Date: Wed, 13 Jan 2010 21:25:18 +0000
|
+++ Python-3.1.1/Lib/distutils/unixccompiler.py 2009-09-04 17:49:54.000000000 -0400
|
||||||
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
|
@@ -141,6 +141,15 @@ class UnixCCompiler(CCompiler):
|
||||||
library path from rpath Was Patch0 in ivazquez' python3000 specfile
|
|
||||||
|
|
||||||
---
|
|
||||||
Lib/distutils/unixccompiler.py | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
|
|
||||||
index d10a78da31..4df4b67810 100644
|
|
||||||
--- a/Lib/distutils/unixccompiler.py
|
|
||||||
+++ b/Lib/distutils/unixccompiler.py
|
|
||||||
@@ -82,6 +82,15 @@ class UnixCCompiler(CCompiler):
|
|
||||||
if sys.platform == "cygwin":
|
if sys.platform == "cygwin":
|
||||||
exe_extension = ".exe"
|
exe_extension = ".exe"
|
||||||
|
|
||||||
@ -28,6 +17,3 @@ index d10a78da31..4df4b67810 100644
|
|||||||
def preprocess(self, source, output_file=None, macros=None,
|
def preprocess(self, source, output_file=None, macros=None,
|
||||||
include_dirs=None, extra_preargs=None, extra_postargs=None):
|
include_dirs=None, extra_preargs=None, extra_postargs=None):
|
||||||
fixed_args = self._fix_compile_args(None, macros, include_dirs)
|
fixed_args = self._fix_compile_args(None, macros, include_dirs)
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
|
762
00055-systemtap.patch
Normal file
762
00055-systemtap.patch
Normal file
@ -0,0 +1,762 @@
|
|||||||
|
diff -up Python-3.3.0rc2/configure.ac.systemtap Python-3.3.0rc2/configure.ac
|
||||||
|
--- Python-3.3.0rc2/configure.ac.systemtap 2012-09-09 05:11:14.000000000 -0400
|
||||||
|
+++ Python-3.3.0rc2/configure.ac 2012-09-10 09:17:21.114511781 -0400
|
||||||
|
@@ -2678,6 +2678,23 @@ if test "$with_valgrind" != no; then
|
||||||
|
OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
+# Check for systemtap support
|
||||||
|
+# On Linux, /usr/bin/dtrace is in fact a shim to SystemTap
|
||||||
|
+AC_MSG_CHECKING([for --with-systemtap])
|
||||||
|
+AC_ARG_WITH([systemtap],
|
||||||
|
+ AC_HELP_STRING([--with(out)-systemtap], [disable/enable SystemTap support]),,
|
||||||
|
+ with_systemtap=no)
|
||||||
|
+AC_MSG_RESULT([$with_systemtap])
|
||||||
|
+if test "$with_systemtap" != no; then
|
||||||
|
+ AC_DEFINE(WITH_SYSTEMTAP, 1,
|
||||||
|
+ [Define if you want to compile in SystemTap support])
|
||||||
|
+ SYSTEMTAPOBJS="Python/pysystemtap.o"
|
||||||
|
+ SYSTEMTAPDEPS="\$(srcdir)/Python/pysystemtap.h"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(SYSTEMTAPOBJS)
|
||||||
|
+AC_SUBST(SYSTEMTAPDEPS)
|
||||||
|
+
|
||||||
|
# -I${DLINCLDIR} is added to the compile rule for importdl.o
|
||||||
|
AC_SUBST(DLINCLDIR)
|
||||||
|
DLINCLDIR=.
|
||||||
|
diff -up Python-3.3.0rc2/Doc/howto/index.rst.systemtap Python-3.3.0rc2/Doc/howto/index.rst
|
||||||
|
--- Python-3.3.0rc2/Doc/howto/index.rst.systemtap 2012-09-09 05:10:51.000000000 -0400
|
||||||
|
+++ Python-3.3.0rc2/Doc/howto/index.rst 2012-09-10 09:17:21.117511779 -0400
|
||||||
|
@@ -29,4 +29,5 @@ Currently, the HOWTOs are:
|
||||||
|
argparse.rst
|
||||||
|
ipaddress.rst
|
||||||
|
clinic.rst
|
||||||
|
+ instrumentation.rst
|
||||||
|
|
||||||
|
diff -up Python-3.3.0rc2/Doc/howto/instrumentation.rst.systemtap Python-3.3.0rc2/Doc/howto/instrumentation.rst
|
||||||
|
--- Python-3.3.0rc2/Doc/howto/instrumentation.rst.systemtap 2012-09-10 09:17:21.117511779 -0400
|
||||||
|
+++ Python-3.3.0rc2/Doc/howto/instrumentation.rst 2012-09-10 09:17:21.117511779 -0400
|
||||||
|
@@ -0,0 +1,295 @@
|
||||||
|
+.. _instrumentation:
|
||||||
|
+
|
||||||
|
+====================================
|
||||||
|
+Instrumenting CPython with SystemTap
|
||||||
|
+====================================
|
||||||
|
+
|
||||||
|
+:author: David Malcolm <dmalcolm@redhat.com>
|
||||||
|
+
|
||||||
|
+DTrace and SystemTap are monitoring tools, each providing a way to inspect
|
||||||
|
+what the processes on a computer system are doing. They both use
|
||||||
|
+domain-specific languages allowing a user to write scripts which:
|
||||||
|
+
|
||||||
|
+ - filter which processes are to be observed
|
||||||
|
+ - gather data from the processes of interest
|
||||||
|
+ - generate reports on the data
|
||||||
|
+
|
||||||
|
+As of Python 3.3, CPython can be built with embedded "markers" that can be
|
||||||
|
+observed by a SystemTap script, making it easier to monitor what the CPython
|
||||||
|
+processes on a system are doing.
|
||||||
|
+
|
||||||
|
+.. Potentially this document could be expanded to also cover DTrace markers.
|
||||||
|
+ However, I'm not a DTrace expert.
|
||||||
|
+
|
||||||
|
+.. I'm using ".. code-block:: c" for SystemTap scripts, as "c" is syntactically
|
||||||
|
+ the closest match that Sphinx supports
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Enabling the static markers
|
||||||
|
+---------------------------
|
||||||
|
+
|
||||||
|
+In order to build CPython with the embedded markers for SystemTap, the
|
||||||
|
+SystemTap development tools must be installed.
|
||||||
|
+
|
||||||
|
+On a Fedora or Red Hat Enterprise Linux machine, this can be done via::
|
||||||
|
+
|
||||||
|
+ yum install systemtap-sdt-devel
|
||||||
|
+
|
||||||
|
+CPython must then be configured `--with-systemtap`::
|
||||||
|
+
|
||||||
|
+ checking for --with-systemtap... yes
|
||||||
|
+
|
||||||
|
+You can verify if the SystemTap static markers are present in the built
|
||||||
|
+binary by seeing if it contains a ".note.stapsdt" section.
|
||||||
|
+
|
||||||
|
+.. code-block:: bash
|
||||||
|
+
|
||||||
|
+ $ eu-readelf -S ./python | grep .note.stapsdt
|
||||||
|
+ [29] .note.stapsdt NOTE 0000000000000000 00308d78 000000b8 0 0 0 4
|
||||||
|
+
|
||||||
|
+If you've built python as a shared library (with --enable-shared), you need
|
||||||
|
+to look instead within the shared library. For example:
|
||||||
|
+
|
||||||
|
+.. code-block:: bash
|
||||||
|
+
|
||||||
|
+ $ eu-readelf -S libpython3.3dm.so.1.0 | grep .note.stapsdt
|
||||||
|
+ [28] .note.stapsdt NOTE 0000000000000000 00365b68 000000b8 0 0 0 4
|
||||||
|
+
|
||||||
|
+Earlier versions of SystemTap stored the markers in a ".probes" section.
|
||||||
|
+
|
||||||
|
+For the curious, you can see the metadata for the static markers using this
|
||||||
|
+invocation.
|
||||||
|
+
|
||||||
|
+.. code-block:: bash
|
||||||
|
+
|
||||||
|
+ $ eu-readelf -x .note.stapsdt ./python
|
||||||
|
+
|
||||||
|
+ Hex dump of section [29] '.note.stapsdt', 184 bytes at offset 0x308d78:
|
||||||
|
+ 0x00000000 08000000 45000000 03000000 73746170 ....E.......stap
|
||||||
|
+ 0x00000010 73647400 d4664b00 00000000 4fc36600 sdt..fK.....O.f.
|
||||||
|
+ 0x00000020 00000000 488d9000 00000000 70797468 ....H.......pyth
|
||||||
|
+ 0x00000030 6f6e0066 756e6374 696f6e5f 5f656e74 on.function__ent
|
||||||
|
+ 0x00000040 72790038 40257261 78203840 25726478 ry.8@%rax 8@%rdx
|
||||||
|
+ 0x00000050 202d3440 25656378 00000000 08000000 -4@%ecx........
|
||||||
|
+ 0x00000060 46000000 03000000 73746170 73647400 F.......stapsdt.
|
||||||
|
+ 0x00000070 0d674b00 00000000 4fc36600 00000000 .gK.....O.f.....
|
||||||
|
+ 0x00000080 4a8d9000 00000000 70797468 6f6e0066 J.......python.f
|
||||||
|
+ 0x00000090 756e6374 696f6e5f 5f726574 75726e00 unction__return.
|
||||||
|
+ 0x000000a0 38402572 61782038 40257264 78202d34 8@%rax 8@%rdx -4
|
||||||
|
+ 0x000000b0 40256563 78000000 @%ecx...
|
||||||
|
+
|
||||||
|
+and a sufficiently modern eu-readelf can print the metadata:
|
||||||
|
+
|
||||||
|
+.. code-block:: bash
|
||||||
|
+
|
||||||
|
+ $ eu-readelf -n ./python
|
||||||
|
+
|
||||||
|
+ Note section [ 1] '.note.gnu.build-id' of 36 bytes at offset 0x190:
|
||||||
|
+ Owner Data size Type
|
||||||
|
+ GNU 20 GNU_BUILD_ID
|
||||||
|
+ Build ID: a28f8db1b224530b0d38ad7b82a249cf7c3f18d6
|
||||||
|
+
|
||||||
|
+ Note section [27] '.note.stapsdt' of 184 bytes at offset 0x1ae884:
|
||||||
|
+ Owner Data size Type
|
||||||
|
+ stapsdt 70 Version: 3
|
||||||
|
+ PC: 0xe0d3a, Base: 0x14b150, Semaphore: 0x3ae882
|
||||||
|
+ Provider: python, Name: function__return, Args: '8@%rbx 8@%r13 -4@%eax'
|
||||||
|
+ stapsdt 69 Version: 3
|
||||||
|
+ PC: 0xe0f37, Base: 0x14b150, Semaphore: 0x3ae880
|
||||||
|
+ Provider: python, Name: function__entry, Args: '8@%rbx 8@%r13 -4@%eax'
|
||||||
|
+
|
||||||
|
+The above metadata contains information for SystemTap describing how it can
|
||||||
|
+patch strategically-placed machine code instructions to enable the tracing
|
||||||
|
+hooks used by a SystemTap script.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Static markers
|
||||||
|
+--------------
|
||||||
|
+
|
||||||
|
+The low-level way to use the SystemTap integration is to use the static
|
||||||
|
+markers directly. This requires you to explicitly state the binary file
|
||||||
|
+containing them.
|
||||||
|
+
|
||||||
|
+For example, this script can be used to show the call/return hierarchy of a
|
||||||
|
+Python script:
|
||||||
|
+
|
||||||
|
+.. code-block:: c
|
||||||
|
+
|
||||||
|
+ probe process('python').mark("function__entry") {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+
|
||||||
|
+ printf("%s => %s in %s:%d\\n",
|
||||||
|
+ thread_indent(1), funcname, filename, lineno);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ probe process('python').mark("function__return") {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+
|
||||||
|
+ printf("%s <= %s in %s:%d\\n",
|
||||||
|
+ thread_indent(-1), funcname, filename, lineno);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+It can be invoked like this:
|
||||||
|
+
|
||||||
|
+.. code-block:: bash
|
||||||
|
+
|
||||||
|
+ $ stap \
|
||||||
|
+ show-call-hierarchy.stp \
|
||||||
|
+ -c ./python test.py
|
||||||
|
+
|
||||||
|
+The output looks like this::
|
||||||
|
+
|
||||||
|
+ 11408 python(8274): => __contains__ in Lib/_abcoll.py:362
|
||||||
|
+ 11414 python(8274): => __getitem__ in Lib/os.py:425
|
||||||
|
+ 11418 python(8274): => encode in Lib/os.py:490
|
||||||
|
+ 11424 python(8274): <= encode in Lib/os.py:493
|
||||||
|
+ 11428 python(8274): <= __getitem__ in Lib/os.py:426
|
||||||
|
+ 11433 python(8274): <= __contains__ in Lib/_abcoll.py:366
|
||||||
|
+
|
||||||
|
+where the columns are:
|
||||||
|
+
|
||||||
|
+ - time in microseconds since start of script
|
||||||
|
+
|
||||||
|
+ - name of executable
|
||||||
|
+
|
||||||
|
+ - PID of process
|
||||||
|
+
|
||||||
|
+and the remainder indicates the call/return hierarchy as the script executes.
|
||||||
|
+
|
||||||
|
+For a `--enable-shared` build of CPython, the markers are contained within the
|
||||||
|
+libpython shared library, and the probe's dotted path needs to reflect this. For
|
||||||
|
+example, this line from the above example::
|
||||||
|
+
|
||||||
|
+ probe process('python').mark("function__entry") {
|
||||||
|
+
|
||||||
|
+should instead read::
|
||||||
|
+
|
||||||
|
+ probe process('python').library("libpython3.3dm.so.1.0").mark("function__entry") {
|
||||||
|
+
|
||||||
|
+(assuming a debug build of CPython 3.3)
|
||||||
|
+
|
||||||
|
+.. I'm reusing the "c:function" type for markers
|
||||||
|
+
|
||||||
|
+.. c:function:: function__entry(str filename, str funcname, int lineno)
|
||||||
|
+
|
||||||
|
+ This marker indicates that execution of a Python function has begun. It is
|
||||||
|
+ only triggered for pure-python (bytecode) functions.
|
||||||
|
+
|
||||||
|
+ The filename, function name, and line number are provided back to the
|
||||||
|
+ tracing script as positional arguments, which must be accessed using
|
||||||
|
+ `$arg1`, `$arg2`:
|
||||||
|
+
|
||||||
|
+ * `$arg1` : `(const char *)` filename, accessible using `user_string($arg1)`
|
||||||
|
+
|
||||||
|
+ * `$arg2` : `(const char *)` function name, accessible using
|
||||||
|
+ `user_string($arg2)`
|
||||||
|
+
|
||||||
|
+ * `$arg3` : `int` line number
|
||||||
|
+
|
||||||
|
+ * `$arg4` : `(PyFrameObject *)`, the frame being executed
|
||||||
|
+
|
||||||
|
+.. c:function:: function__return(str filename, str funcname, int lineno)
|
||||||
|
+
|
||||||
|
+ This marker is the converse of `function__entry`, and indicates that
|
||||||
|
+ execution of a Python function has ended (either via ``return``, or via an
|
||||||
|
+ exception). It is only triggered for pure-python (bytecode) functions.
|
||||||
|
+
|
||||||
|
+ The arguments are the same as for `function__entry`
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Tapsets
|
||||||
|
+-------
|
||||||
|
+
|
||||||
|
+The higher-level way to use the SystemTap integration is to use a "tapset":
|
||||||
|
+SystemTap's equivalent of a library, which hides some of the lower-level
|
||||||
|
+details of the static markers.
|
||||||
|
+
|
||||||
|
+Here is a tapset file, based on a non-shared build of CPython:
|
||||||
|
+
|
||||||
|
+.. code-block:: c
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ Provide a higher-level wrapping around the function__entry and
|
||||||
|
+ function__return markers:
|
||||||
|
+ */
|
||||||
|
+ probe python.function.entry = process("python").mark("function__entry")
|
||||||
|
+ {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+ frameptr = $arg4
|
||||||
|
+ }
|
||||||
|
+ probe python.function.return = process("python").mark("function__return")
|
||||||
|
+ {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+ frameptr = $arg4
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+If this file is installed in SystemTap's tapset directory (e.g.
|
||||||
|
+`/usr/share/systemtap/tapset`), then these additional probepoints become
|
||||||
|
+available:
|
||||||
|
+
|
||||||
|
+.. c:function:: python.function.entry(str filename, str funcname, int lineno, frameptr)
|
||||||
|
+
|
||||||
|
+ This probe point indicates that execution of a Python function has begun.
|
||||||
|
+ It is only triggered for pure-python (bytecode) functions.
|
||||||
|
+
|
||||||
|
+.. c:function:: python.function.return(str filename, str funcname, int lineno, frameptr)
|
||||||
|
+
|
||||||
|
+ This probe point is the converse of `python.function.return`, and indicates
|
||||||
|
+ that execution of a Python function has ended (either via ``return``, or
|
||||||
|
+ via an exception). It is only triggered for pure-python (bytecode) functions.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Examples
|
||||||
|
+--------
|
||||||
|
+This SystemTap script uses the tapset above to more cleanly implement the
|
||||||
|
+example given above of tracing the Python function-call hierarchy, without
|
||||||
|
+needing to directly name the static markers:
|
||||||
|
+
|
||||||
|
+.. code-block:: c
|
||||||
|
+
|
||||||
|
+ probe python.function.entry
|
||||||
|
+ {
|
||||||
|
+ printf("%s => %s in %s:%d\n",
|
||||||
|
+ thread_indent(1), funcname, filename, lineno);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ probe python.function.return
|
||||||
|
+ {
|
||||||
|
+ printf("%s <= %s in %s:%d\n",
|
||||||
|
+ thread_indent(-1), funcname, filename, lineno);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+The following script uses the tapset above to provide a top-like view of all
|
||||||
|
+running CPython code, showing the top 20 most frequently-entered bytecode
|
||||||
|
+frames, each second, across the whole system:
|
||||||
|
+
|
||||||
|
+.. code-block:: c
|
||||||
|
+
|
||||||
|
+ global fn_calls;
|
||||||
|
+
|
||||||
|
+ probe python.function.entry
|
||||||
|
+ {
|
||||||
|
+ fn_calls[pid(), filename, funcname, lineno] += 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ probe timer.ms(1000) {
|
||||||
|
+ printf("\033[2J\033[1;1H") /* clear screen */
|
||||||
|
+ printf("%6s %80s %6s %30s %6s\n",
|
||||||
|
+ "PID", "FILENAME", "LINE", "FUNCTION", "CALLS")
|
||||||
|
+ foreach ([pid, filename, funcname, lineno] in fn_calls- limit 20) {
|
||||||
|
+ printf("%6d %80s %6d %30s %6d\n",
|
||||||
|
+ pid, filename, lineno, funcname,
|
||||||
|
+ fn_calls[pid, filename, funcname, lineno]);
|
||||||
|
+ }
|
||||||
|
+ delete fn_calls;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
diff -up Python-3.3.0rc2/Lib/test/test_systemtap.py.systemtap Python-3.3.0rc2/Lib/test/test_systemtap.py
|
||||||
|
--- Python-3.3.0rc2/Lib/test/test_systemtap.py.systemtap 2012-09-10 09:17:21.117511779 -0400
|
||||||
|
+++ Python-3.3.0rc2/Lib/test/test_systemtap.py 2012-09-10 09:17:21.117511779 -0400
|
||||||
|
@@ -0,0 +1,234 @@
|
||||||
|
+# Verify that systemtap static probes work
|
||||||
|
+#
|
||||||
|
+import subprocess
|
||||||
|
+import sys
|
||||||
|
+import sysconfig
|
||||||
|
+import os
|
||||||
|
+import unittest
|
||||||
|
+
|
||||||
|
+from test.support import run_unittest, TESTFN, unlink
|
||||||
|
+
|
||||||
|
+if '--with-systemtap' not in sysconfig.get_config_var('CONFIG_ARGS'):
|
||||||
|
+ raise unittest.SkipTest("Python was not configured --with-systemtap")
|
||||||
|
+
|
||||||
|
+try:
|
||||||
|
+ _, stap_version = subprocess.Popen(["stap", "-V"],
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ stderr=subprocess.PIPE,
|
||||||
|
+ ).communicate()
|
||||||
|
+except OSError:
|
||||||
|
+ # This is what "no stap" looks like. There may, however, be other
|
||||||
|
+ # errors that manifest this way too.
|
||||||
|
+ raise unittest.SkipTest("Couldn't find stap on the path")
|
||||||
|
+
|
||||||
|
+def invoke_systemtap_script(script, cmd):
|
||||||
|
+ # Start a child process, probing with the given systemtap script
|
||||||
|
+ # (passed as stdin to the "stap" tool)
|
||||||
|
+ # The script should be a bytes instance
|
||||||
|
+ # Return (stdout, stderr) pair
|
||||||
|
+
|
||||||
|
+ p = subprocess.Popen(["stap", "-", '-vv', '-c', cmd],
|
||||||
|
+ stdin=subprocess.PIPE,
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ stderr=subprocess.PIPE)
|
||||||
|
+ out, err = p.communicate(input=script)
|
||||||
|
+ return out, err
|
||||||
|
+
|
||||||
|
+# Verify that stap can run a simple "hello world"-style script
|
||||||
|
+# This can fail for various reasons:
|
||||||
|
+# - missing kernel headers
|
||||||
|
+# - permissions (a non-root user needs to be in the "stapdev" group)
|
||||||
|
+TRIVIAL_STAP_SCRIPT = b'probe begin { println("hello world") exit () }'
|
||||||
|
+
|
||||||
|
+out, err = invoke_systemtap_script(TRIVIAL_STAP_SCRIPT, 'true')
|
||||||
|
+if out != b'hello world\n':
|
||||||
|
+ raise unittest.SkipTest("Test systemtap script did not run; stderr was: %s" % err)
|
||||||
|
+
|
||||||
|
+# We don't expect stderr to be empty, since we're invoking stap with "-vv": stap
|
||||||
|
+# will (we hope) generate debugging output on stderr.
|
||||||
|
+
|
||||||
|
+def invoke_python_under_systemtap(script, pythoncode=None, pythonfile=None):
|
||||||
|
+ # Start a child python process, probing with the given systemtap script
|
||||||
|
+ # (passed as stdin to the "stap" tool)
|
||||||
|
+ # The script should be a bytes instance
|
||||||
|
+ # Return (stdout, stderr) pair
|
||||||
|
+
|
||||||
|
+ if pythonfile:
|
||||||
|
+ pythoncmd = '%s %s' % (sys.executable, pythonfile)
|
||||||
|
+ else:
|
||||||
|
+ pythoncmd = '%s -c %r' % (sys.executable, pythoncode)
|
||||||
|
+
|
||||||
|
+ # The process tree of a stap invocation of a command goes through
|
||||||
|
+ # something like this:
|
||||||
|
+ # stap ->fork/exec(staprun; exec stapio ->f/e(-c cmd); exec staprun -r)
|
||||||
|
+ # and this trip through setuid leads to LD_LIBRARY_PATH being dropped,
|
||||||
|
+ # which would lead to an --enable-shared build of python failing to be
|
||||||
|
+ # find its libpython, with an error like:
|
||||||
|
+ # error while loading shared libraries: libpython3.3dm.so.1.0: cannot
|
||||||
|
+ # open shared object file: No such file or directory
|
||||||
|
+ # Hence we need to jump through some hoops to expose LD_LIBRARY_PATH to
|
||||||
|
+ # the invoked python process:
|
||||||
|
+ LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
|
||||||
|
+ if LD_LIBRARY_PATH:
|
||||||
|
+ pythoncmd = 'env LD_LIBRARY_PATH=%s ' % LD_LIBRARY_PATH + pythoncmd
|
||||||
|
+
|
||||||
|
+ return invoke_systemtap_script(script, pythoncmd)
|
||||||
|
+
|
||||||
|
+# When using the static markers, we need to supply the prefix of a systemtap
|
||||||
|
+# dotted probe point that containing the marker.
|
||||||
|
+# See http://sourceware.org/systemtap/langref/Probe_points.html
|
||||||
|
+#
|
||||||
|
+# We need to determine if this is a shared-library build
|
||||||
|
+#
|
||||||
|
+# Note that sysconfig can get this wrong; see:
|
||||||
|
+# http://bugs.python.org/issue14774
|
||||||
|
+#
|
||||||
|
+if '--enable-shared' in sysconfig.get_config_var('CONFIG_ARGS'):
|
||||||
|
+ # For a shared-library build, the markers are in library(INSTSONAME):
|
||||||
|
+ INSTSONAME = sysconfig.get_config_var('INSTSONAME')
|
||||||
|
+ probe_prefix = 'process("%s").library("%s")' % (sys.executable, INSTSONAME)
|
||||||
|
+else:
|
||||||
|
+ # For a non-shared-library build, we can simply use sys.executable:
|
||||||
|
+ probe_prefix = 'process("%s")' % sys.executable
|
||||||
|
+
|
||||||
|
+# The following script ought to generate lots of lines showing recursive
|
||||||
|
+# function entry and return, of the form:
|
||||||
|
+# 11408 python(8274): => __contains__ in Lib/_abcoll.py:362
|
||||||
|
+# 11414 python(8274): => __getitem__ in Lib/os.py:425
|
||||||
|
+# 11418 python(8274): => encode in Lib/os.py:490
|
||||||
|
+# 11424 python(8274): <= encode in Lib/os.py:493
|
||||||
|
+# 11428 python(8274): <= __getitem__ in Lib/os.py:426
|
||||||
|
+# 11433 python(8274): <= __contains__ in Lib/_abcoll.py:366
|
||||||
|
+# where the column are:
|
||||||
|
+# - time in microseconds since start of script
|
||||||
|
+# - name of executable
|
||||||
|
+# - PID of process
|
||||||
|
+# and the remainder indicates the call/return hierarchy
|
||||||
|
+
|
||||||
|
+hierarchy_script = ('''
|
||||||
|
+probe %s.mark("function__entry") {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+
|
||||||
|
+ printf("%%s => %%s in %%s:%%d\\n", thread_indent(1), funcname, filename, lineno);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+probe %s.mark("function__return") {
|
||||||
|
+ filename = user_string($arg1);
|
||||||
|
+ funcname = user_string($arg2);
|
||||||
|
+ lineno = $arg3;
|
||||||
|
+
|
||||||
|
+ printf("%%s <= %%s in %%s:%%d\\n", thread_indent(-1), funcname, filename, lineno);
|
||||||
|
+}
|
||||||
|
+''' % (probe_prefix, probe_prefix)).encode('utf-8')
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+class ErrorDumper:
|
||||||
|
+ # A context manager that dumps extra information if an exception is raised,
|
||||||
|
+ # to help track down why the problem occurred
|
||||||
|
+ def __init__(self, out, err):
|
||||||
|
+ self.out = out
|
||||||
|
+ self.err = err
|
||||||
|
+
|
||||||
|
+ def __enter__(self):
|
||||||
|
+ pass
|
||||||
|
+
|
||||||
|
+ def __exit__(self, type_, value, traceback):
|
||||||
|
+ if type_:
|
||||||
|
+ # an exception is being raised:
|
||||||
|
+ print('stdout: %s' % out.decode())
|
||||||
|
+ print('stderr: %s' % err.decode())
|
||||||
|
+
|
||||||
|
+class SystemtapTests(unittest.TestCase):
|
||||||
|
+
|
||||||
|
+ def test_invoking_python(self):
|
||||||
|
+ # Ensure that we can invoke python under stap, with a trivial stap
|
||||||
|
+ # script:
|
||||||
|
+ out, err = invoke_python_under_systemtap(
|
||||||
|
+ b'probe begin { println("hello from stap") exit () }',
|
||||||
|
+ pythoncode="print('hello from python')")
|
||||||
|
+ with ErrorDumper(out, err):
|
||||||
|
+ self.assertIn(b'hello from stap', out)
|
||||||
|
+ self.assertIn(b'hello from python', out)
|
||||||
|
+
|
||||||
|
+ def test_function_entry(self):
|
||||||
|
+ # Ensure that the function_entry static marker works
|
||||||
|
+ out, err = invoke_python_under_systemtap(hierarchy_script)
|
||||||
|
+ # stdout ought to contain various lines showing recursive function
|
||||||
|
+ # entry and return (see above)
|
||||||
|
+
|
||||||
|
+ # Uncomment this for debugging purposes:
|
||||||
|
+ # print(out.decode('utf-8'))
|
||||||
|
+
|
||||||
|
+ # Executing the cmdline-supplied "pass":
|
||||||
|
+ # 0 python(8274): => <module> in <string>:1
|
||||||
|
+ # 5 python(8274): <= <module> in <string>:1
|
||||||
|
+ with ErrorDumper(out, err):
|
||||||
|
+ self.assertIn(b'=> <module> in <string>:1', out,
|
||||||
|
+ msg="stdout: %s\nstderr: %s\n" % (out, err))
|
||||||
|
+
|
||||||
|
+ def test_function_encoding(self):
|
||||||
|
+ # Ensure that function names containing non-Latin 1 code
|
||||||
|
+ # points are handled:
|
||||||
|
+ pythonfile = TESTFN
|
||||||
|
+ try:
|
||||||
|
+ unlink(pythonfile)
|
||||||
|
+ f = open(pythonfile, "wb")
|
||||||
|
+ f.write("""
|
||||||
|
+# Sample script with non-ASCII filename, for use by test_systemtap.py
|
||||||
|
+# Implicitly UTF-8
|
||||||
|
+
|
||||||
|
+def 文字化け():
|
||||||
|
+ '''Function with non-ASCII identifier; I believe this reads "mojibake"'''
|
||||||
|
+ print("hello world!")
|
||||||
|
+
|
||||||
|
+文字化け()
|
||||||
|
+""".encode('utf-8'))
|
||||||
|
+ f.close()
|
||||||
|
+
|
||||||
|
+ out, err = invoke_python_under_systemtap(hierarchy_script,
|
||||||
|
+ pythonfile=pythonfile)
|
||||||
|
+ out_utf8 = out.decode('utf-8')
|
||||||
|
+ with ErrorDumper(out, err):
|
||||||
|
+ self.assertIn('=> <module> in %s:5' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn(' => 文字化け in %s:5' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn(' <= 文字化け in %s:7' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn('<= <module> in %s:9' % pythonfile, out_utf8)
|
||||||
|
+ finally:
|
||||||
|
+ unlink(pythonfile)
|
||||||
|
+
|
||||||
|
+ @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
|
||||||
|
+ 'the test filename is not encodable with ASCII')
|
||||||
|
+ def test_filename_encoding(self):
|
||||||
|
+ # Ensure that scripts names containing non-Latin 1 code
|
||||||
|
+ # points are handled:
|
||||||
|
+ pythonfile = TESTFN + '_☠.py'
|
||||||
|
+ try:
|
||||||
|
+ unlink(pythonfile)
|
||||||
|
+ f = open(pythonfile, "wb")
|
||||||
|
+ f.write("""
|
||||||
|
+def foo():
|
||||||
|
+ '''Function with non-ASCII identifier; I believe this reads "mojibake"'''
|
||||||
|
+ print("hello world!")
|
||||||
|
+
|
||||||
|
+foo()
|
||||||
|
+""".encode('utf-8'))
|
||||||
|
+ f.close()
|
||||||
|
+
|
||||||
|
+ out, err = invoke_python_under_systemtap(hierarchy_script,
|
||||||
|
+ pythonfile=pythonfile)
|
||||||
|
+ out_utf8 = out.decode('utf-8')
|
||||||
|
+ with ErrorDumper(out, err):
|
||||||
|
+ self.assertIn('=> <module> in %s:2' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn(' => foo in %s:2' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn(' <= foo in %s:4' % pythonfile, out_utf8)
|
||||||
|
+ self.assertIn('<= <module> in %s:6' % pythonfile, out_utf8)
|
||||||
|
+ finally:
|
||||||
|
+ unlink(pythonfile)
|
||||||
|
+
|
||||||
|
+def test_main():
|
||||||
|
+ run_unittest(SystemtapTests)
|
||||||
|
+
|
||||||
|
+if __name__ == "__main__":
|
||||||
|
+ test_main()
|
||||||
|
diff -up Python-3.3.0rc2/Makefile.pre.in.systemtap Python-3.3.0rc2/Makefile.pre.in
|
||||||
|
--- Python-3.3.0rc2/Makefile.pre.in.systemtap 2012-09-09 05:11:05.000000000 -0400
|
||||||
|
+++ Python-3.3.0rc2/Makefile.pre.in 2012-09-10 09:19:51.195501518 -0400
|
||||||
|
@@ -363,6 +363,7 @@ PYTHON_OBJS= \
|
||||||
|
Python/formatter_unicode.o \
|
||||||
|
Python/fileutils.o \
|
||||||
|
Python/$(DYNLOADFILE) \
|
||||||
|
+ @SYSTEMTAPOBJS@ \
|
||||||
|
$(LIBOBJS) \
|
||||||
|
$(MACHDEP_OBJS) \
|
||||||
|
$(THREADOBJ)
|
||||||
|
@@ -713,7 +714,8 @@ Objects/setobject.o: $(srcdir)/Objects/s
|
||||||
|
$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
|
||||||
|
$(OPCODETARGETGEN) $(OPCODETARGETS_H)
|
||||||
|
|
||||||
|
-Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
|
||||||
|
+Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h \
|
||||||
|
+ $(srcdir)/Python/ceval_systemtap.h @SYSTEMTAPDEPS@
|
||||||
|
|
||||||
|
Python/frozen.o: Python/importlib.h Python/importlib_external.h
|
||||||
|
|
||||||
|
@@ -724,6 +726,13 @@ Objects/typeobject.o: $(srcdir)/Objects/
|
||||||
|
Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
|
||||||
|
$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
|
||||||
|
|
||||||
|
+# Only needed with --with-systemtap; not a public header:
|
||||||
|
+$(srcdir)/Python/pysystemtap.h: $(srcdir)/Python/pysystemtap.d
|
||||||
|
+ dtrace -o $@ $(DFLAGS) -C -h -s $(srcdir)/Python/pysystemtap.d
|
||||||
|
+
|
||||||
|
+Python/pysystemtap.o: $(srcdir)/Python/pysystemtap.d Python/ceval.o
|
||||||
|
+ dtrace -o $@ $(DFLAGS) -C -G -s $(srcdir)/Python/pysystemtap.d Python/ceval.o
|
||||||
|
+
|
||||||
|
############################################################################
|
||||||
|
# Header files
|
||||||
|
|
||||||
|
@@ -1345,6 +1354,7 @@ clean: pycremoval
|
||||||
|
-rm -f Lib/lib2to3/*Grammar*.pickle
|
||||||
|
-rm -f Programs/_testembed Programs/_freeze_importlib
|
||||||
|
-rm -rf build
|
||||||
|
+ -rm -f $(srcdir)/Python/pysystemtap.h
|
||||||
|
|
||||||
|
profile-removal:
|
||||||
|
find . -name '*.gc??' -exec rm -f {} ';'
|
||||||
|
diff -up Python-3.3.0rc2/pyconfig.h.in.systemtap Python-3.3.0rc2/pyconfig.h.in
|
||||||
|
--- Python-3.3.0rc2/pyconfig.h.in.systemtap 2012-09-09 05:11:14.000000000 -0400
|
||||||
|
+++ Python-3.3.0rc2/pyconfig.h.in 2012-09-10 09:17:21.120511781 -0400
|
||||||
|
@@ -1306,6 +1306,9 @@
|
||||||
|
/* Define if you want to compile in Python-specific mallocs */
|
||||||
|
#undef WITH_PYMALLOC
|
||||||
|
|
||||||
|
+/* Define if you want to compile in SystemTap support */
|
||||||
|
+#undef WITH_SYSTEMTAP
|
||||||
|
+
|
||||||
|
/* Define if you want to compile in rudimentary thread support */
|
||||||
|
#undef WITH_THREAD
|
||||||
|
|
||||||
|
diff -up Python-3.3.0rc2/Python/ceval.c.systemtap Python-3.3.0rc2/Python/ceval.c
|
||||||
|
--- Python-3.3.0rc2/Python/ceval.c.systemtap 2012-09-09 05:11:12.000000000 -0400
|
||||||
|
+++ Python-3.3.0rc2/Python/ceval.c 2012-09-10 09:17:21.122511781 -0400
|
||||||
|
@@ -18,6 +18,8 @@
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
|
+#include "ceval_systemtap.h"
|
||||||
|
+
|
||||||
|
#ifndef WITH_TSC
|
||||||
|
|
||||||
|
#define READ_TIMESTAMP(var)
|
||||||
|
@@ -1160,6 +1162,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (PYTHON_FUNCTION_ENTRY_ENABLED()) {
|
||||||
|
+ systemtap_function_entry(f);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
co = f->f_code;
|
||||||
|
names = co->co_names;
|
||||||
|
consts = co->co_consts;
|
||||||
|
@@ -3077,6 +3083,11 @@ fast_yield:
|
||||||
|
|
||||||
|
/* pop frame */
|
||||||
|
exit_eval_frame:
|
||||||
|
+
|
||||||
|
+ if (PYTHON_FUNCTION_RETURN_ENABLED()) {
|
||||||
|
+ systemtap_function_return(f);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
Py_LeaveRecursiveCall();
|
||||||
|
f->f_executing = 0;
|
||||||
|
tstate->frame = f->f_back;
|
||||||
|
diff -up Python-3.3.0rc2/Python/ceval_systemtap.h.systemtap Python-3.3.0rc2/Python/ceval_systemtap.h
|
||||||
|
--- Python-3.3.0rc2/Python/ceval_systemtap.h.systemtap 2012-09-10 09:17:21.122511781 -0400
|
||||||
|
+++ Python-3.3.0rc2/Python/ceval_systemtap.h 2012-09-10 09:17:21.122511781 -0400
|
||||||
|
@@ -0,0 +1,86 @@
|
||||||
|
+/*
|
||||||
|
+ Support for SystemTap static markers
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+#ifdef WITH_SYSTEMTAP
|
||||||
|
+
|
||||||
|
+#include "pysystemtap.h"
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ A struct to hold all of the information gathered when one of the traceable
|
||||||
|
+ markers is triggered
|
||||||
|
+*/
|
||||||
|
+struct frame_marker_info
|
||||||
|
+{
|
||||||
|
+ PyObject *filename_obj;
|
||||||
|
+ PyObject *funcname_obj;
|
||||||
|
+ const char *filename;
|
||||||
|
+ const char *funcname;
|
||||||
|
+ int lineno;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+get_frame_marker_info(PyFrameObject *f, struct frame_marker_info *fmi)
|
||||||
|
+{
|
||||||
|
+ PyObject *ptype;
|
||||||
|
+ PyObject *pvalue;
|
||||||
|
+ PyObject *ptraceback;
|
||||||
|
+
|
||||||
|
+ PyErr_Fetch(&ptype, &pvalue, &ptraceback);
|
||||||
|
+
|
||||||
|
+ fmi->filename_obj = PyUnicode_EncodeFSDefault(f->f_code->co_filename);
|
||||||
|
+ if (fmi->filename_obj) {
|
||||||
|
+ fmi->filename = PyBytes_AsString(fmi->filename_obj);
|
||||||
|
+ } else {
|
||||||
|
+ fmi->filename = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ fmi->funcname_obj = PyUnicode_AsUTF8String(f->f_code->co_name);
|
||||||
|
+ if (fmi->funcname_obj) {
|
||||||
|
+ fmi->funcname = PyBytes_AsString(fmi->funcname_obj);
|
||||||
|
+ } else {
|
||||||
|
+ fmi->funcname = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ fmi->lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
|
||||||
|
+
|
||||||
|
+ PyErr_Restore(ptype, pvalue, ptraceback);
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+release_frame_marker_info(struct frame_marker_info *fmi)
|
||||||
|
+{
|
||||||
|
+ Py_XDECREF(fmi->filename_obj);
|
||||||
|
+ Py_XDECREF(fmi->funcname_obj);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+systemtap_function_entry(PyFrameObject *f)
|
||||||
|
+{
|
||||||
|
+ struct frame_marker_info fmi;
|
||||||
|
+ get_frame_marker_info(f, &fmi);
|
||||||
|
+ PYTHON_FUNCTION_ENTRY(fmi.filename, fmi.funcname, fmi.lineno, f);
|
||||||
|
+ release_frame_marker_info(&fmi);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+systemtap_function_return(PyFrameObject *f)
|
||||||
|
+{
|
||||||
|
+ struct frame_marker_info fmi;
|
||||||
|
+ get_frame_marker_info(f, &fmi);
|
||||||
|
+ PYTHON_FUNCTION_RETURN(fmi.filename, fmi.funcname, fmi.lineno, f);
|
||||||
|
+ release_frame_marker_info(&fmi);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#else /* #ifdef WITH_SYSTEMTAP */
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ When configured --without-systemtap, everything compiles away to nothing:
|
||||||
|
+*/
|
||||||
|
+#define PYTHON_FUNCTION_ENTRY_ENABLED() 0
|
||||||
|
+#define PYTHON_FUNCTION_RETURN_ENABLED() 0
|
||||||
|
+#define systemtap_function_entry(f)
|
||||||
|
+#define systemtap_function_return(f)
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
diff -up Python-3.3.0rc2/Python/pysystemtap.d.systemtap Python-3.3.0rc2/Python/pysystemtap.d
|
||||||
|
--- Python-3.3.0rc2/Python/pysystemtap.d.systemtap 2012-09-10 09:17:21.122511781 -0400
|
||||||
|
+++ Python-3.3.0rc2/Python/pysystemtap.d 2012-09-10 09:17:21.122511781 -0400
|
||||||
|
@@ -0,0 +1,4 @@
|
||||||
|
+provider python {
|
||||||
|
+ probe function__entry(const char *, const char *, int, PyFrameObject *);
|
||||||
|
+ probe function__return(const char *, const char *, int, PyFrameObject *);
|
||||||
|
+};
|
@ -1,39 +1,5 @@
|
|||||||
From 96580364051672475607c88cdb31ec875cea6e97 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Date: Wed, 13 Jan 2010 21:25:18 +0000
|
|
||||||
Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
|
|
||||||
instead or /usr/lib/
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Only used when "%{_lib}" == "lib64".
|
|
||||||
|
|
||||||
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Co-authored-by: Thomas Spura <tomspur@fedoraproject.org>
|
|
||||||
Co-authored-by: Slavek Kabrda <bkabrda@redhat.com>
|
|
||||||
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
|
|
||||||
Co-authored-by: Tomas Orsava <torsava@redhat.com>
|
|
||||||
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
|
|
||||||
Co-authored-by: Petr Viktorin <pviktori@redhat.com>
|
|
||||||
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
||||||
Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
|
|
||||||
---
|
|
||||||
Lib/distutils/command/install.py | 4 ++--
|
|
||||||
Lib/distutils/sysconfig.py | 6 +++++-
|
|
||||||
Lib/distutils/tests/test_install.py | 3 ++-
|
|
||||||
Lib/site.py | 4 ++++
|
|
||||||
Lib/sysconfig.py | 12 ++++++------
|
|
||||||
Lib/test/test_site.py | 4 ++--
|
|
||||||
Makefile.pre.in | 2 +-
|
|
||||||
Modules/getpath.c | 6 +++---
|
|
||||||
configure | 4 ++--
|
|
||||||
configure.ac | 4 ++--
|
|
||||||
setup.py | 6 +++---
|
|
||||||
11 files changed, 32 insertions(+), 23 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
|
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
|
||||||
index c625c95bf7..ae4f915669 100644
|
index 9474e9c..c0ce4c6 100644
|
||||||
--- a/Lib/distutils/command/install.py
|
--- a/Lib/distutils/command/install.py
|
||||||
+++ b/Lib/distutils/command/install.py
|
+++ b/Lib/distutils/command/install.py
|
||||||
@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
|
@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
|
||||||
@ -54,10 +20,10 @@ index c625c95bf7..ae4f915669 100644
|
|||||||
'scripts': '$base/bin',
|
'scripts': '$base/bin',
|
||||||
'data' : '$base',
|
'data' : '$base',
|
||||||
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
|
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
|
||||||
index b51629eb94..9a4892a737 100644
|
index 026cca7..6d3e077 100644
|
||||||
--- a/Lib/distutils/sysconfig.py
|
--- a/Lib/distutils/sysconfig.py
|
||||||
+++ b/Lib/distutils/sysconfig.py
|
+++ b/Lib/distutils/sysconfig.py
|
||||||
@@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
@@ -132,8 +132,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
||||||
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
||||||
|
|
||||||
if os.name == "posix":
|
if os.name == "posix":
|
||||||
@ -71,11 +37,10 @@ index b51629eb94..9a4892a737 100644
|
|||||||
if standard_lib:
|
if standard_lib:
|
||||||
return libpython
|
return libpython
|
||||||
else:
|
else:
|
||||||
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
|
diff a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
|
||||||
index 287ab1989e..d4c05e0ab1 100644
|
|
||||||
--- a/Lib/distutils/tests/test_install.py
|
--- a/Lib/distutils/tests/test_install.py
|
||||||
+++ b/Lib/distutils/tests/test_install.py
|
+++ b/Lib/distutils/tests/test_install.py
|
||||||
@@ -57,8 +57,9 @@ class InstallTestCase(support.TempdirManager,
|
@@ -57,8 +57,9 @@
|
||||||
self.assertEqual(got, expected)
|
self.assertEqual(got, expected)
|
||||||
|
|
||||||
libdir = os.path.join(destination, "lib", "python")
|
libdir = os.path.join(destination, "lib", "python")
|
||||||
@ -87,10 +52,10 @@ index 287ab1989e..d4c05e0ab1 100644
|
|||||||
check_path(cmd.install_headers,
|
check_path(cmd.install_headers,
|
||||||
os.path.join(destination, "include", "python", "foopkg"))
|
os.path.join(destination, "include", "python", "foopkg"))
|
||||||
diff --git a/Lib/site.py b/Lib/site.py
|
diff --git a/Lib/site.py b/Lib/site.py
|
||||||
index a065ab0b5d..22d53fa562 100644
|
index a84e3bb..ba0d3ea 100644
|
||||||
--- a/Lib/site.py
|
--- a/Lib/site.py
|
||||||
+++ b/Lib/site.py
|
+++ b/Lib/site.py
|
||||||
@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
|
@@ -303,11 +303,15 @@ def getsitepackages(prefixes=None):
|
||||||
seen.add(prefix)
|
seen.add(prefix)
|
||||||
|
|
||||||
if os.sep == '/':
|
if os.sep == '/':
|
||||||
@ -104,10 +69,10 @@ index a065ab0b5d..22d53fa562 100644
|
|||||||
sitepackages.append(prefix)
|
sitepackages.append(prefix)
|
||||||
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
|
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
|
||||||
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
|
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
|
||||||
return sitepackages
|
if sys.platform == "darwin":
|
||||||
|
# for framework builds *only* we add the standard Apple
|
||||||
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
||||||
index b9e2fafbc0..0ae6d35b69 100644
|
index b9bbfe5..2a5f29c 100644
|
||||||
--- a/Lib/sysconfig.py
|
--- a/Lib/sysconfig.py
|
||||||
+++ b/Lib/sysconfig.py
|
+++ b/Lib/sysconfig.py
|
||||||
@@ -20,10 +20,10 @@ __all__ = [
|
@@ -20,10 +20,10 @@ __all__ = [
|
||||||
@ -124,7 +89,7 @@ index b9e2fafbc0..0ae6d35b69 100644
|
|||||||
'include':
|
'include':
|
||||||
'{installed_base}/include/python{py_version_short}{abiflags}',
|
'{installed_base}/include/python{py_version_short}{abiflags}',
|
||||||
'platinclude':
|
'platinclude':
|
||||||
@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
|
@@ -61,10 +61,10 @@ _INSTALL_SCHEMES = {
|
||||||
'data': '{userbase}',
|
'data': '{userbase}',
|
||||||
},
|
},
|
||||||
'posix_user': {
|
'posix_user': {
|
||||||
@ -139,13 +104,13 @@ index b9e2fafbc0..0ae6d35b69 100644
|
|||||||
'scripts': '{userbase}/bin',
|
'scripts': '{userbase}/bin',
|
||||||
'data': '{userbase}',
|
'data': '{userbase}',
|
||||||
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
|
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
|
||||||
index 41c4229919..543c88432a 100644
|
index f698927..bc977b5 100644
|
||||||
--- a/Lib/test/test_site.py
|
--- a/Lib/test/test_site.py
|
||||||
+++ b/Lib/test/test_site.py
|
+++ b/Lib/test/test_site.py
|
||||||
@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
@@ -248,8 +248,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
||||||
dirs = site.getsitepackages()
|
self.assertEqual(dirs[1], wanted)
|
||||||
if os.sep == '/':
|
elif os.sep == '/':
|
||||||
# OS X, Linux, FreeBSD, etc
|
# OS X non-framwework builds, Linux, FreeBSD, etc
|
||||||
- self.assertEqual(len(dirs), 1)
|
- self.assertEqual(len(dirs), 1)
|
||||||
- wanted = os.path.join('xoxo', 'lib',
|
- wanted = os.path.join('xoxo', 'lib',
|
||||||
+ self.assertEqual(len(dirs), 2)
|
+ self.assertEqual(len(dirs), 2)
|
||||||
@ -154,10 +119,10 @@ index 41c4229919..543c88432a 100644
|
|||||||
'site-packages')
|
'site-packages')
|
||||||
self.assertEqual(dirs[0], wanted)
|
self.assertEqual(dirs[0], wanted)
|
||||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||||
index a914a9c70f..406a441082 100644
|
index 8fa7934..a693917 100644
|
||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -143,7 +143,7 @@ LIBDIR= @libdir@
|
@@ -126,7 +126,7 @@ LIBDIR= @libdir@
|
||||||
MANDIR= @mandir@
|
MANDIR= @mandir@
|
||||||
INCLUDEDIR= @includedir@
|
INCLUDEDIR= @includedir@
|
||||||
CONFINCLUDEDIR= $(exec_prefix)/include
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
||||||
@ -167,95 +132,71 @@ index a914a9c70f..406a441082 100644
|
|||||||
|
|
||||||
# Detailed destination directories
|
# Detailed destination directories
|
||||||
diff --git a/Modules/getpath.c b/Modules/getpath.c
|
diff --git a/Modules/getpath.c b/Modules/getpath.c
|
||||||
index b727f66953..a0c5fb6139 100644
|
index 65b47a3..eaa756c 100644
|
||||||
--- a/Modules/getpath.c
|
--- a/Modules/getpath.c
|
||||||
+++ b/Modules/getpath.c
|
+++ b/Modules/getpath.c
|
||||||
@@ -730,7 +730,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig,
|
@@ -494,7 +494,7 @@ calculate_path(void)
|
||||||
if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
|
_pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
|
||||||
return PATHLEN_ERR();
|
_prefix = Py_DecodeLocale(PREFIX, NULL);
|
||||||
}
|
_exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
|
||||||
- status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
|
- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
|
||||||
+ status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len);
|
+ lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
|
||||||
if (_PyStatus_EXCEPTION(status)) {
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
@@ -1067,7 +1067,7 @@ calculate_zip_path(PyCalculatePath *calculate, const wchar_t *prefix,
|
|
||||||
return PATHLEN_ERR();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- status = joinpath(zip_path, L"lib/python00.zip", zip_path_len);
|
|
||||||
+ status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len);
|
|
||||||
if (_PyStatus_EXCEPTION(status)) {
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
@@ -1197,7 +1197,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config)
|
|
||||||
if (!calculate->exec_prefix) {
|
|
||||||
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
|
|
||||||
}
|
|
||||||
- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
|
|
||||||
+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
|
|
||||||
if (!calculate->lib_python) {
|
|
||||||
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
|
|
||||||
}
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index a979363acf..b89ae1be3c 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -15188,9 +15188,9 @@ fi
|
|
||||||
|
|
||||||
|
if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
|
||||||
if test x$PLATFORM_TRIPLET = x; then
|
Py_FatalError(
|
||||||
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
|
@@ -683,7 +683,7 @@ calculate_path(void)
|
||||||
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
|
}
|
||||||
else
|
else
|
||||||
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
wcsncpy(zip_path, _prefix, MAXPATHLEN);
|
||||||
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
- joinpath(zip_path, L"lib/python00.zip");
|
||||||
fi
|
+ joinpath(zip_path, L"lib64/python00.zip");
|
||||||
|
bufsz = wcslen(zip_path); /* Replace "00" with version */
|
||||||
|
zip_path[bufsz - 6] = VERSION[0];
|
||||||
diff --git a/configure.ac b/configure.ac
|
zip_path[bufsz - 5] = VERSION[2];
|
||||||
index e57ef7c38b..c59cbc223f 100644
|
@@ -695,7 +695,7 @@ calculate_path(void)
|
||||||
--- a/configure.ac
|
fprintf(stderr,
|
||||||
+++ b/configure.ac
|
"Could not find platform dependent libraries <exec_prefix>\n");
|
||||||
@@ -4674,9 +4674,9 @@ fi
|
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
|
||||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
- joinpath(exec_prefix, L"lib/lib-dynload");
|
||||||
AC_SUBST(PY_ENABLE_SHARED)
|
+ joinpath(exec_prefix, L"lib64/lib-dynload");
|
||||||
if test x$PLATFORM_TRIPLET = x; then
|
}
|
||||||
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
|
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
|
||||||
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
|
|
||||||
else
|
|
||||||
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
||||||
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
||||||
fi
|
|
||||||
AC_SUBST(LIBPL)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
diff --git a/setup.py b/setup.py
|
||||||
index 20d7f35652..024a1035c0 100644
|
index 0f2dfc4..da37896 100644
|
||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/setup.py
|
+++ b/setup.py
|
||||||
@@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
|
@@ -492,7 +492,7 @@ class PyBuildExt(build_ext):
|
||||||
# directories (i.e. '.' and 'Include') must be first. See issue
|
# directories (i.e. '.' and 'Include') must be first. See issue
|
||||||
# 10520.
|
# 10520.
|
||||||
if not CROSS_COMPILING:
|
if not cross_compiling:
|
||||||
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
||||||
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
|
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
|
||||||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||||||
# only change this for cross builds for 3.3, issues on Mageia
|
# only change this for cross builds for 3.3, issues on Mageia
|
||||||
if CROSS_COMPILING:
|
if cross_compiling:
|
||||||
@@ -953,11 +953,11 @@ class PyBuildExt(build_ext):
|
@@ -780,11 +780,11 @@ class PyBuildExt(build_ext):
|
||||||
elif curses_library:
|
elif curses_library:
|
||||||
readline_libs.append(curses_library)
|
readline_libs.append(curses_library)
|
||||||
elif self.compiler.find_library_file(self.lib_dirs +
|
elif self.compiler.find_library_file(lib_dirs +
|
||||||
- ['/usr/lib/termcap'],
|
- ['/usr/lib/termcap'],
|
||||||
+ ['/usr/lib64/termcap'],
|
+ ['/usr/lib64/termcap'],
|
||||||
'termcap'):
|
'termcap'):
|
||||||
readline_libs.append('termcap')
|
readline_libs.append('termcap')
|
||||||
self.add(Extension('readline', ['readline.c'],
|
exts.append( Extension('readline', ['readline.c'],
|
||||||
- library_dirs=['/usr/lib/termcap'],
|
- library_dirs=['/usr/lib/termcap'],
|
||||||
+ library_dirs=['/usr/lib64/termcap'],
|
+ library_dirs=['/usr/lib64/termcap'],
|
||||||
extra_link_args=readline_extra_link_args,
|
extra_link_args=readline_extra_link_args,
|
||||||
libraries=readline_libs) )
|
libraries=readline_libs) )
|
||||||
else:
|
else:
|
||||||
--
|
@@ -821,8 +821,8 @@ class PyBuildExt(build_ext):
|
||||||
2.24.1
|
if krb5_h:
|
||||||
|
ssl_incs += krb5_h
|
||||||
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
||||||
|
- ['/usr/local/ssl/lib',
|
||||||
|
- '/usr/contrib/ssl/lib/'
|
||||||
|
+ ['/usr/local/ssl/lib64',
|
||||||
|
+ '/usr/contrib/ssl/lib64/'
|
||||||
|
] )
|
||||||
|
|
||||||
|
if (ssl_incs is not None and
|
||||||
|
@ -1,61 +1,45 @@
|
|||||||
From fb93392b0f4975a02775a608611dc9ceb20c06ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Date: Mon, 18 Jan 2010 17:59:07 +0000
|
|
||||||
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Downstream only: not appropriate for upstream.
|
|
||||||
|
|
||||||
See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
|
||||||
|
|
||||||
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
|
|
||||||
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
|
|
||||||
Co-authored-by: Robert Kuska <rkuska@redhat.com>
|
|
||||||
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
|
|
||||||
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
||||||
---
|
|
||||||
Makefile.pre.in | 21 ++-------------------
|
|
||||||
1 file changed, 2 insertions(+), 19 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||||
index 406a441082..917303dd92 100644
|
index 70e5927..04c8e3d 100644
|
||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
|
@@ -556,7 +556,7 @@ clinic: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
|
||||||
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
|
$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
|
||||||
|
|
||||||
# Build the interpreter
|
# Build the interpreter
|
||||||
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
|
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||||||
|
|
||||||
platform: $(BUILDPYTHON) pybuilddir.txt
|
platform: $(BUILDPYTHON) pybuilddir.txt
|
||||||
@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
@@ -601,18 +601,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
||||||
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
|
||||||
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
||||||
|
|
||||||
-
|
|
||||||
-# Build static library
|
-# Build static library
|
||||||
|
-# avoid long command lines, same as LIBRARY_OBJS
|
||||||
-$(LIBRARY): $(LIBRARY_OBJS)
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
||||||
- -rm -f $@
|
- -rm -f $@
|
||||||
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
|
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
||||||
|
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
||||||
|
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
||||||
|
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
|
||||||
|
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
|
||||||
|
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
||||||
|
- $(RANLIB) $@
|
||||||
-
|
-
|
||||||
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
|
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
|
||||||
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
||||||
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
||||||
@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
|
@@ -702,7 +690,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
|
||||||
@echo "The Makefile was updated, you may need to re-run make."
|
echo "-----------------------------------------------"; \
|
||||||
|
fi
|
||||||
|
|
||||||
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
|
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
@@ -1557,17 +1551,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
@@ -1382,18 +1370,6 @@ libainstall: all python-config
|
||||||
else true; \
|
else true; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
@ -65,6 +49,7 @@ index 406a441082..917303dd92 100644
|
|||||||
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
||||||
- else \
|
- else \
|
||||||
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
||||||
|
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
||||||
- fi; \
|
- fi; \
|
||||||
- else \
|
- else \
|
||||||
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
||||||
@ -73,6 +58,3 @@ index 406a441082..917303dd92 100644
|
|||||||
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
||||||
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
||||||
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
|
46
00132-add-rpmbuild-hooks-to-unittest.patch
Normal file
46
00132-add-rpmbuild-hooks-to-unittest.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
diff -up Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/case.py
|
||||||
|
--- Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400
|
||||||
|
+++ Python-3.2.2/Lib/unittest/case.py 2011-09-09 06:35:16.365568382 -0400
|
||||||
|
@@ -3,6 +3,7 @@
|
||||||
|
import sys
|
||||||
|
import functools
|
||||||
|
import difflib
|
||||||
|
+import os
|
||||||
|
import logging
|
||||||
|
import pprint
|
||||||
|
import re
|
||||||
|
@@ -101,5 +102,21 @@ def expectedFailure(func):
|
||||||
|
raise self.test_case.failureException(msg)
|
||||||
|
|
||||||
|
+# Non-standard/downstream-only hooks for handling issues with specific test
|
||||||
|
+# cases:
|
||||||
|
+
|
||||||
|
+def _skipInRpmBuild(reason):
|
||||||
|
+ """
|
||||||
|
+ Non-standard/downstream-only decorator for marking a specific unit test
|
||||||
|
+ to be skipped when run within the %check of an rpmbuild.
|
||||||
|
+
|
||||||
|
+ Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
|
||||||
|
+ the environment, and has no effect otherwise.
|
||||||
|
+ """
|
||||||
|
+ if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
|
||||||
|
+ return skip(reason)
|
||||||
|
+ else:
|
||||||
|
+ return _id
|
||||||
|
+
|
||||||
|
class _AssertRaisesBaseContext(_BaseTestCaseContext):
|
||||||
|
|
||||||
|
def __init__(self, expected, test_case, expected_regex=None):
|
||||||
|
diff -up Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/__init__.py
|
||||||
|
--- Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400
|
||||||
|
+++ Python-3.2.2/Lib/unittest/__init__.py 2011-09-09 06:35:16.366568382 -0400
|
||||||
|
@@ -57,7 +57,8 @@ __unittest = True
|
||||||
|
|
||||||
|
from .result import TestResult
|
||||||
|
from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
|
||||||
|
- skipUnless, expectedFailure)
|
||||||
|
+ skipUnless, expectedFailure,
|
||||||
|
+ _skipInRpmBuild)
|
||||||
|
from .suite import BaseTestSuite, TestSuite
|
||||||
|
from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
|
||||||
|
findTestCases)
|
15
00155-avoid-ctypes-thunks.patch
Normal file
15
00155-avoid-ctypes-thunks.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -up Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391 Python-3.2.3/Lib/ctypes/__init__.py
|
||||||
|
--- Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391 2012-04-20 15:12:49.017867692 -0400
|
||||||
|
+++ Python-3.2.3/Lib/ctypes/__init__.py 2012-04-20 15:15:09.501111408 -0400
|
||||||
|
@@ -275,11 +275,6 @@ def _reset_cache():
|
||||||
|
# _SimpleCData.c_char_p_from_param
|
||||||
|
POINTER(c_char).from_param = c_char_p.from_param
|
||||||
|
_pointer_type_cache[None] = c_void_p
|
||||||
|
- # XXX for whatever reasons, creating the first instance of a callback
|
||||||
|
- # function is needed for the unittests on Win64 to succeed. This MAY
|
||||||
|
- # be a compiler bug, since the problem occurs only when _ctypes is
|
||||||
|
- # compiled with the MS SDK compiler. Or an uninitialized variable?
|
||||||
|
- CFUNCTYPE(c_int)(lambda: None)
|
||||||
|
|
||||||
|
def create_unicode_buffer(init, size=None):
|
||||||
|
"""create_unicode_buffer(aString) -> character array
|
11
00160-disable-test_fs_holes-in-rpm-build.patch
Normal file
11
00160-disable-test_fs_holes-in-rpm-build.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build cpython-59223da36dec/Lib/test/test_posix.py
|
||||||
|
--- cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build 2012-08-07 17:15:59.000000000 -0400
|
||||||
|
+++ cpython-59223da36dec/Lib/test/test_posix.py 2012-08-07 17:16:53.528330330 -0400
|
||||||
|
@@ -973,6 +973,7 @@ class PosixTester(unittest.TestCase):
|
||||||
|
posix.RTLD_GLOBAL
|
||||||
|
posix.RTLD_LOCAL
|
||||||
|
|
||||||
|
+ @unittest._skipInRpmBuild('running kernel may not match kernel in chroot')
|
||||||
|
@unittest.skipUnless(hasattr(os, 'SEEK_HOLE'),
|
||||||
|
"test needs an OS that reports file holes")
|
||||||
|
def test_fs_holes(self):
|
11
00163-disable-parts-of-test_socket-in-rpm-build.patch
Normal file
11
00163-disable-parts-of-test_socket-in-rpm-build.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds Python-3.3.0b1/Lib/test/test_socket.py
|
||||||
|
--- Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds 2012-07-24 15:02:30.823355067 -0400
|
||||||
|
+++ Python-3.3.0b1/Lib/test/test_socket.py 2012-07-24 15:08:13.021354999 -0400
|
||||||
|
@@ -2188,6 +2188,7 @@ class RecvmsgGenericStreamTests(RecvmsgG
|
||||||
|
# Tests which require a stream socket and can use either recvmsg()
|
||||||
|
# or recvmsg_into().
|
||||||
|
|
||||||
|
+ @unittest._skipInRpmBuild('fails intermittently when run within Koji')
|
||||||
|
def testRecvmsgEOF(self):
|
||||||
|
# Receive end-of-stream indicator (b"", peer socket closed).
|
||||||
|
msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, 1024)
|
310
00170-gc-assertions.patch
Normal file
310
00170-gc-assertions.patch
Normal file
@ -0,0 +1,310 @@
|
|||||||
|
diff --git a/Include/object.h b/Include/object.h
|
||||||
|
index 0c88603..e3413e8 100644
|
||||||
|
--- a/Include/object.h
|
||||||
|
+++ b/Include/object.h
|
||||||
|
@@ -1059,6 +1059,49 @@ PyAPI_FUNC(void)
|
||||||
|
_PyObject_DebugTypeStats(FILE *out);
|
||||||
|
#endif /* ifndef Py_LIMITED_API */
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ Define a pair of assertion macros.
|
||||||
|
+
|
||||||
|
+ These work like the regular C assert(), in that they will abort the
|
||||||
|
+ process with a message on stderr if the given condition fails to hold,
|
||||||
|
+ but compile away to nothing if NDEBUG is defined.
|
||||||
|
+
|
||||||
|
+ However, before aborting, Python will also try to call _PyObject_Dump() on
|
||||||
|
+ the given object. This may be of use when investigating bugs in which a
|
||||||
|
+ particular object is corrupt (e.g. buggy a tp_visit method in an extension
|
||||||
|
+ module breaking the garbage collector), to help locate the broken objects.
|
||||||
|
+
|
||||||
|
+ The WITH_MSG variant allows you to supply an additional message that Python
|
||||||
|
+ will attempt to print to stderr, after the object dump.
|
||||||
|
+*/
|
||||||
|
+#ifdef NDEBUG
|
||||||
|
+/* No debugging: compile away the assertions: */
|
||||||
|
+#define PyObject_ASSERT_WITH_MSG(obj, expr, msg) ((void)0)
|
||||||
|
+#else
|
||||||
|
+/* With debugging: generate checks: */
|
||||||
|
+#define PyObject_ASSERT_WITH_MSG(obj, expr, msg) \
|
||||||
|
+ ((expr) \
|
||||||
|
+ ? (void)(0) \
|
||||||
|
+ : _PyObject_AssertFailed((obj), \
|
||||||
|
+ (msg), \
|
||||||
|
+ (__STRING(expr)), \
|
||||||
|
+ (__FILE__), \
|
||||||
|
+ (__LINE__), \
|
||||||
|
+ (__PRETTY_FUNCTION__)))
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define PyObject_ASSERT(obj, expr) \
|
||||||
|
+ PyObject_ASSERT_WITH_MSG(obj, expr, NULL)
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ Declare and define the entrypoint even when NDEBUG is defined, to avoid
|
||||||
|
+ causing compiler/linker errors when building extensions without NDEBUG
|
||||||
|
+ against a Python built with NDEBUG defined
|
||||||
|
+*/
|
||||||
|
+PyAPI_FUNC(void) _PyObject_AssertFailed(PyObject *, const char *,
|
||||||
|
+ const char *, const char *, int,
|
||||||
|
+ const char *);
|
||||||
|
+
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
|
||||||
|
index e727499..6efcafb 100644
|
||||||
|
--- a/Lib/test/test_gc.py
|
||||||
|
+++ b/Lib/test/test_gc.py
|
||||||
|
@@ -1,10 +1,11 @@
|
||||||
|
import unittest
|
||||||
|
from test.support import (verbose, refcount_test, run_unittest,
|
||||||
|
strip_python_stderr, cpython_only, start_threads,
|
||||||
|
- temp_dir, requires_type_collecting)
|
||||||
|
+ temp_dir, import_module, requires_type_collecting)
|
||||||
|
from test.support.script_helper import assert_python_ok, make_script
|
||||||
|
|
||||||
|
import sys
|
||||||
|
+import sysconfig
|
||||||
|
import time
|
||||||
|
import gc
|
||||||
|
import weakref
|
||||||
|
@@ -50,6 +51,8 @@ class GC_Detector(object):
|
||||||
|
# gc collects it.
|
||||||
|
self.wr = weakref.ref(C1055820(666), it_happened)
|
||||||
|
|
||||||
|
+BUILD_WITH_NDEBUG = ('-DNDEBUG' in sysconfig.get_config_vars()['PY_CFLAGS'])
|
||||||
|
+
|
||||||
|
@with_tp_del
|
||||||
|
class Uncollectable(object):
|
||||||
|
"""Create a reference cycle with multiple __del__ methods.
|
||||||
|
@@ -862,6 +865,50 @@ class GCCallbackTests(unittest.TestCase):
|
||||||
|
self.assertEqual(len(gc.garbage), 0)
|
||||||
|
|
||||||
|
|
||||||
|
+ @unittest.skipIf(BUILD_WITH_NDEBUG,
|
||||||
|
+ 'built with -NDEBUG')
|
||||||
|
+ def test_refcount_errors(self):
|
||||||
|
+ self.preclean()
|
||||||
|
+ # Verify the "handling" of objects with broken refcounts
|
||||||
|
+ import_module("ctypes") #skip if not supported
|
||||||
|
+
|
||||||
|
+ import subprocess
|
||||||
|
+ code = '''if 1:
|
||||||
|
+ a = []
|
||||||
|
+ b = [a]
|
||||||
|
+
|
||||||
|
+ # Simulate the refcount of "a" being too low (compared to the
|
||||||
|
+ # references held on it by live data), but keeping it above zero
|
||||||
|
+ # (to avoid deallocating it):
|
||||||
|
+ import ctypes
|
||||||
|
+ ctypes.pythonapi.Py_DecRef(ctypes.py_object(a))
|
||||||
|
+
|
||||||
|
+ # The garbage collector should now have a fatal error when it reaches
|
||||||
|
+ # the broken object:
|
||||||
|
+ import gc
|
||||||
|
+ gc.collect()
|
||||||
|
+ '''
|
||||||
|
+ p = subprocess.Popen([sys.executable, "-c", code],
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ stderr=subprocess.PIPE)
|
||||||
|
+ stdout, stderr = p.communicate()
|
||||||
|
+ p.stdout.close()
|
||||||
|
+ p.stderr.close()
|
||||||
|
+ # Verify that stderr has a useful error message:
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'Modules/gcmodule.c:[0-9]+: visit_decref: Assertion "\(\(gc\)->gc.gc_refs >> \(1\)\) != 0" failed.')
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'refcount was too small')
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'object : \[\]')
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'type : list')
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'refcount: 1')
|
||||||
|
+ self.assertRegex(stderr,
|
||||||
|
+ b'address : 0x[0-9a-f]+')
|
||||||
|
+
|
||||||
|
+
|
||||||
|
class GCTogglingTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
gc.enable()
|
||||||
|
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
|
||||||
|
index 0c6f444..87edd5a 100644
|
||||||
|
--- a/Modules/gcmodule.c
|
||||||
|
+++ b/Modules/gcmodule.c
|
||||||
|
@@ -341,7 +341,8 @@ update_refs(PyGC_Head *containers)
|
||||||
|
{
|
||||||
|
PyGC_Head *gc = containers->gc.gc_next;
|
||||||
|
for (; gc != containers; gc = gc->gc.gc_next) {
|
||||||
|
- assert(_PyGCHead_REFS(gc) == GC_REACHABLE);
|
||||||
|
+ PyObject_ASSERT(FROM_GC(gc),
|
||||||
|
+ _PyGCHead_REFS(gc) == GC_REACHABLE);
|
||||||
|
_PyGCHead_SET_REFS(gc, Py_REFCNT(FROM_GC(gc)));
|
||||||
|
/* Python's cyclic gc should never see an incoming refcount
|
||||||
|
* of 0: if something decref'ed to 0, it should have been
|
||||||
|
@@ -361,7 +362,8 @@ update_refs(PyGC_Head *containers)
|
||||||
|
* so serious that maybe this should be a release-build
|
||||||
|
* check instead of an assert?
|
||||||
|
*/
|
||||||
|
- assert(_PyGCHead_REFS(gc) != 0);
|
||||||
|
+ PyObject_ASSERT(FROM_GC(gc),
|
||||||
|
+ _PyGCHead_REFS(gc) != 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -376,7 +378,9 @@ visit_decref(PyObject *op, void *data)
|
||||||
|
* generation being collected, which can be recognized
|
||||||
|
* because only they have positive gc_refs.
|
||||||
|
*/
|
||||||
|
- assert(_PyGCHead_REFS(gc) != 0); /* else refcount was too small */
|
||||||
|
+ PyObject_ASSERT_WITH_MSG(FROM_GC(gc),
|
||||||
|
+ _PyGCHead_REFS(gc) != 0,
|
||||||
|
+ "refcount was too small"); /* else refcount was too small */
|
||||||
|
if (_PyGCHead_REFS(gc) > 0)
|
||||||
|
_PyGCHead_DECREF(gc);
|
||||||
|
}
|
||||||
|
@@ -436,9 +440,10 @@ visit_reachable(PyObject *op, PyGC_Head *reachable)
|
||||||
|
* If gc_refs == GC_UNTRACKED, it must be ignored.
|
||||||
|
*/
|
||||||
|
else {
|
||||||
|
- assert(gc_refs > 0
|
||||||
|
- || gc_refs == GC_REACHABLE
|
||||||
|
- || gc_refs == GC_UNTRACKED);
|
||||||
|
+ PyObject_ASSERT(FROM_GC(gc),
|
||||||
|
+ gc_refs > 0
|
||||||
|
+ || gc_refs == GC_REACHABLE
|
||||||
|
+ || gc_refs == GC_UNTRACKED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
@@ -480,7 +485,7 @@ move_unreachable(PyGC_Head *young, PyGC_Head *unreachable)
|
||||||
|
*/
|
||||||
|
PyObject *op = FROM_GC(gc);
|
||||||
|
traverseproc traverse = Py_TYPE(op)->tp_traverse;
|
||||||
|
- assert(_PyGCHead_REFS(gc) > 0);
|
||||||
|
+ PyObject_ASSERT(op, _PyGCHead_REFS(gc) > 0);
|
||||||
|
_PyGCHead_SET_REFS(gc, GC_REACHABLE);
|
||||||
|
(void) traverse(op,
|
||||||
|
(visitproc)visit_reachable,
|
||||||
|
@@ -543,7 +548,7 @@ move_legacy_finalizers(PyGC_Head *unreachable, PyGC_Head *finalizers)
|
||||||
|
for (gc = unreachable->gc.gc_next; gc != unreachable; gc = next) {
|
||||||
|
PyObject *op = FROM_GC(gc);
|
||||||
|
|
||||||
|
- assert(IS_TENTATIVELY_UNREACHABLE(op));
|
||||||
|
+ PyObject_ASSERT(op, IS_TENTATIVELY_UNREACHABLE(op));
|
||||||
|
next = gc->gc.gc_next;
|
||||||
|
|
||||||
|
if (has_legacy_finalizer(op)) {
|
||||||
|
@@ -619,7 +624,7 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
|
||||||
|
PyWeakReference **wrlist;
|
||||||
|
|
||||||
|
op = FROM_GC(gc);
|
||||||
|
- assert(IS_TENTATIVELY_UNREACHABLE(op));
|
||||||
|
+ PyObject_ASSERT(op, IS_TENTATIVELY_UNREACHABLE(op));
|
||||||
|
next = gc->gc.gc_next;
|
||||||
|
|
||||||
|
if (! PyType_SUPPORTS_WEAKREFS(Py_TYPE(op)))
|
||||||
|
@@ -640,9 +645,9 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
|
||||||
|
* the callback pointer intact. Obscure: it also
|
||||||
|
* changes *wrlist.
|
||||||
|
*/
|
||||||
|
- assert(wr->wr_object == op);
|
||||||
|
+ PyObject_ASSERT(wr->wr_object, wr->wr_object == op);
|
||||||
|
_PyWeakref_ClearRef(wr);
|
||||||
|
- assert(wr->wr_object == Py_None);
|
||||||
|
+ PyObject_ASSERT(wr->wr_object, wr->wr_object == Py_None);
|
||||||
|
if (wr->wr_callback == NULL)
|
||||||
|
continue; /* no callback */
|
||||||
|
|
||||||
|
@@ -676,7 +681,7 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
|
||||||
|
*/
|
||||||
|
if (IS_TENTATIVELY_UNREACHABLE(wr))
|
||||||
|
continue;
|
||||||
|
- assert(IS_REACHABLE(wr));
|
||||||
|
+ PyObject_ASSERT(op, IS_REACHABLE(wr));
|
||||||
|
|
||||||
|
/* Create a new reference so that wr can't go away
|
||||||
|
* before we can process it again.
|
||||||
|
@@ -685,7 +690,8 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
|
||||||
|
|
||||||
|
/* Move wr to wrcb_to_call, for the next pass. */
|
||||||
|
wrasgc = AS_GC(wr);
|
||||||
|
- assert(wrasgc != next); /* wrasgc is reachable, but
|
||||||
|
+ PyObject_ASSERT(op, wrasgc != next);
|
||||||
|
+ /* wrasgc is reachable, but
|
||||||
|
next isn't, so they can't
|
||||||
|
be the same */
|
||||||
|
gc_list_move(wrasgc, &wrcb_to_call);
|
||||||
|
@@ -701,11 +707,11 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
|
||||||
|
|
||||||
|
gc = wrcb_to_call.gc.gc_next;
|
||||||
|
op = FROM_GC(gc);
|
||||||
|
- assert(IS_REACHABLE(op));
|
||||||
|
- assert(PyWeakref_Check(op));
|
||||||
|
+ PyObject_ASSERT(op, IS_REACHABLE(op));
|
||||||
|
+ PyObject_ASSERT(op, PyWeakref_Check(op));
|
||||||
|
wr = (PyWeakReference *)op;
|
||||||
|
callback = wr->wr_callback;
|
||||||
|
- assert(callback != NULL);
|
||||||
|
+ PyObject_ASSERT(op, callback != NULL);
|
||||||
|
|
||||||
|
/* copy-paste of weakrefobject.c's handle_callback() */
|
||||||
|
temp = PyObject_CallFunctionObjArgs(callback, wr, NULL);
|
||||||
|
@@ -822,12 +828,14 @@ check_garbage(PyGC_Head *collectable)
|
||||||
|
for (gc = collectable->gc.gc_next; gc != collectable;
|
||||||
|
gc = gc->gc.gc_next) {
|
||||||
|
_PyGCHead_SET_REFS(gc, Py_REFCNT(FROM_GC(gc)));
|
||||||
|
- assert(_PyGCHead_REFS(gc) != 0);
|
||||||
|
+ PyObject_ASSERT(FROM_GC(gc),
|
||||||
|
+ _PyGCHead_REFS(gc) != 0);
|
||||||
|
}
|
||||||
|
subtract_refs(collectable);
|
||||||
|
for (gc = collectable->gc.gc_next; gc != collectable;
|
||||||
|
gc = gc->gc.gc_next) {
|
||||||
|
- assert(_PyGCHead_REFS(gc) >= 0);
|
||||||
|
+ PyObject_ASSERT(FROM_GC(gc),
|
||||||
|
+ _PyGCHead_REFS(gc) >= 0);
|
||||||
|
if (_PyGCHead_REFS(gc) != 0)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
diff --git a/Objects/object.c b/Objects/object.c
|
||||||
|
index 559794f..a47d47f 100644
|
||||||
|
--- a/Objects/object.c
|
||||||
|
+++ b/Objects/object.c
|
||||||
|
@@ -2022,6 +2022,35 @@ _PyTrash_thread_destroy_chain(void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+PyAPI_FUNC(void)
|
||||||
|
+_PyObject_AssertFailed(PyObject *obj, const char *msg, const char *expr,
|
||||||
|
+ const char *file, int line, const char *function)
|
||||||
|
+{
|
||||||
|
+ fprintf(stderr,
|
||||||
|
+ "%s:%d: %s: Assertion \"%s\" failed.\n",
|
||||||
|
+ file, line, function, expr);
|
||||||
|
+ if (msg) {
|
||||||
|
+ fprintf(stderr, "%s\n", msg);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ fflush(stderr);
|
||||||
|
+
|
||||||
|
+ if (obj) {
|
||||||
|
+ /* This might succeed or fail, but we're about to abort, so at least
|
||||||
|
+ try to provide any extra info we can: */
|
||||||
|
+ _PyObject_Dump(obj);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "NULL object\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ fflush(stdout);
|
||||||
|
+ fflush(stderr);
|
||||||
|
+
|
||||||
|
+ /* Terminate the process: */
|
||||||
|
+ abort();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#ifndef Py_TRACE_REFS
|
||||||
|
/* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
|
||||||
|
Define this here, so we can undefine the macro. */
|
30
00178-dont-duplicate-flags-in-sysconfig.patch
Normal file
30
00178-dont-duplicate-flags-in-sysconfig.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
diff -r 39b9b05c3085 Lib/distutils/sysconfig.py
|
||||||
|
--- a/Lib/distutils/sysconfig.py Wed Apr 10 00:27:23 2013 +0200
|
||||||
|
+++ b/Lib/distutils/sysconfig.py Wed Apr 10 10:14:18 2013 +0200
|
||||||
|
@@ -362,7 +362,10 @@
|
||||||
|
done[n] = item = ""
|
||||||
|
if found:
|
||||||
|
after = value[m.end():]
|
||||||
|
- value = value[:m.start()] + item + after
|
||||||
|
+ value = value[:m.start()]
|
||||||
|
+ if item.strip() not in value:
|
||||||
|
+ value += item
|
||||||
|
+ value += after
|
||||||
|
if "$" in after:
|
||||||
|
notdone[name] = value
|
||||||
|
else:
|
||||||
|
diff -r 39b9b05c3085 Lib/sysconfig.py
|
||||||
|
--- a/Lib/sysconfig.py Wed Apr 10 00:27:23 2013 +0200
|
||||||
|
+++ b/Lib/sysconfig.py Wed Apr 10 10:14:18 2013 +0200
|
||||||
|
@@ -296,7 +296,10 @@
|
||||||
|
|
||||||
|
if found:
|
||||||
|
after = value[m.end():]
|
||||||
|
- value = value[:m.start()] + item + after
|
||||||
|
+ value = value[:m.start()]
|
||||||
|
+ if item.strip() not in value:
|
||||||
|
+ value += item
|
||||||
|
+ value += after
|
||||||
|
if "$" in after:
|
||||||
|
notdone[name] = value
|
||||||
|
else:
|
232
00189-add-rewheel-module.patch
Normal file
232
00189-add-rewheel-module.patch
Normal file
@ -0,0 +1,232 @@
|
|||||||
|
diff -Nur Python-3.4.1/Lib/ensurepip/__init__.py Python-3.4.1-rewheel/Lib/ensurepip/__init__.py
|
||||||
|
--- Python-3.4.1/Lib/ensurepip/__init__.py 2014-08-21 10:49:30.792695824 +0200
|
||||||
|
+++ Python-3.4.1-rewheel/Lib/ensurepip/__init__.py 2014-08-21 10:10:41.958341726 +0200
|
||||||
|
@@ -1,8 +1,10 @@
|
||||||
|
import os
|
||||||
|
import os.path
|
||||||
|
import pkgutil
|
||||||
|
+import shutil
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
+from ensurepip import rewheel
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ["version", "bootstrap"]
|
||||||
|
@@ -38,6 +40,8 @@
|
||||||
|
|
||||||
|
# Install the bundled software
|
||||||
|
import pip
|
||||||
|
+ if args[0] in ["install", "list", "wheel"]:
|
||||||
|
+ args.append('--pre')
|
||||||
|
pip.main(args)
|
||||||
|
|
||||||
|
|
||||||
|
@@ -87,20 +91,39 @@
|
||||||
|
# omit pip and easy_install
|
||||||
|
os.environ["ENSUREPIP_OPTIONS"] = "install"
|
||||||
|
|
||||||
|
+ whls = []
|
||||||
|
+ rewheel_dir = None
|
||||||
|
+ # try to see if we have system-wide versions of _PROJECTS
|
||||||
|
+ dep_records = rewheel.find_system_records([p[0] for p in _PROJECTS])
|
||||||
|
+ # TODO: check if system-wide versions are the newest ones
|
||||||
|
+ # if --upgrade is used?
|
||||||
|
+ if all(dep_records):
|
||||||
|
+ # if we have all _PROJECTS installed system-wide, we'll recreate
|
||||||
|
+ # wheels from them and install those
|
||||||
|
+ rewheel_dir = tempfile.TemporaryDirectory()
|
||||||
|
+ for dr in dep_records:
|
||||||
|
+ new_whl = rewheel.rewheel_from_record(dr, rewheel_dir.name)
|
||||||
|
+ whls.append(os.path.join(rewheel_dir.name, new_whl))
|
||||||
|
+ else:
|
||||||
|
+ # if we don't have all the _PROJECTS installed system-wide,
|
||||||
|
+ # let's just fall back to bundled wheels
|
||||||
|
+ for project, version in _PROJECTS:
|
||||||
|
+ whl = os.path.join(
|
||||||
|
+ os.path.dirname(__file__),
|
||||||
|
+ "_bundled",
|
||||||
|
+ "{}-{}-py2.py3-none-any.whl".format(project, version)
|
||||||
|
+ )
|
||||||
|
+ whls.append(whl)
|
||||||
|
+
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
# Put our bundled wheels into a temporary directory and construct the
|
||||||
|
# additional paths that need added to sys.path
|
||||||
|
additional_paths = []
|
||||||
|
- for project, version in _PROJECTS:
|
||||||
|
- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
|
||||||
|
- whl = pkgutil.get_data(
|
||||||
|
- "ensurepip",
|
||||||
|
- "_bundled/{}".format(wheel_name),
|
||||||
|
- )
|
||||||
|
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
||||||
|
- fp.write(whl)
|
||||||
|
-
|
||||||
|
- additional_paths.append(os.path.join(tmpdir, wheel_name))
|
||||||
|
+ for whl in whls:
|
||||||
|
+ shutil.copy(whl, tmpdir)
|
||||||
|
+ additional_paths.append(os.path.join(tmpdir, os.path.basename(whl)))
|
||||||
|
+ if rewheel_dir:
|
||||||
|
+ rewheel_dir.cleanup()
|
||||||
|
|
||||||
|
# Construct the arguments to be passed to the pip command
|
||||||
|
args = ["install", "--no-index", "--find-links", tmpdir]
|
||||||
|
diff -Nur Python-3.4.1/Lib/ensurepip/rewheel/__init__.py Python-3.4.1-rewheel/Lib/ensurepip/rewheel/__init__.py
|
||||||
|
--- Python-3.4.1/Lib/ensurepip/rewheel/__init__.py 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ Python-3.4.1-rewheel/Lib/ensurepip/rewheel/__init__.py 2014-08-21 10:11:22.560320121 +0200
|
||||||
|
@@ -0,0 +1,143 @@
|
||||||
|
+import argparse
|
||||||
|
+import codecs
|
||||||
|
+import csv
|
||||||
|
+import email.parser
|
||||||
|
+import os
|
||||||
|
+import io
|
||||||
|
+import re
|
||||||
|
+import site
|
||||||
|
+import subprocess
|
||||||
|
+import sys
|
||||||
|
+import zipfile
|
||||||
|
+
|
||||||
|
+def run():
|
||||||
|
+ parser = argparse.ArgumentParser(description='Recreate wheel of package with given RECORD.')
|
||||||
|
+ parser.add_argument('record_path',
|
||||||
|
+ help='Path to RECORD file')
|
||||||
|
+ parser.add_argument('-o', '--output-dir',
|
||||||
|
+ help='Dir where to place the wheel, defaults to current working dir.',
|
||||||
|
+ dest='outdir',
|
||||||
|
+ default=os.path.curdir)
|
||||||
|
+
|
||||||
|
+ ns = parser.parse_args()
|
||||||
|
+ retcode = 0
|
||||||
|
+ try:
|
||||||
|
+ print(rewheel_from_record(**vars(ns)))
|
||||||
|
+ except BaseException as e:
|
||||||
|
+ print('Failed: {}'.format(e))
|
||||||
|
+ retcode = 1
|
||||||
|
+ sys.exit(1)
|
||||||
|
+
|
||||||
|
+def find_system_records(projects):
|
||||||
|
+ """Return list of paths to RECORD files for system-installed projects.
|
||||||
|
+
|
||||||
|
+ If a project is not installed, the resulting list contains None instead
|
||||||
|
+ of a path to its RECORD
|
||||||
|
+ """
|
||||||
|
+ records = []
|
||||||
|
+ # get system site-packages dirs
|
||||||
|
+ sys_sitepack = site.getsitepackages([sys.base_prefix, sys.base_exec_prefix])
|
||||||
|
+ sys_sitepack = [sp for sp in sys_sitepack if os.path.exists(sp)]
|
||||||
|
+ # try to find all projects in all system site-packages
|
||||||
|
+ for project in projects:
|
||||||
|
+ path = None
|
||||||
|
+ for sp in sys_sitepack:
|
||||||
|
+ dist_info_re = os.path.join(sp, project) + r'-[^\{0}]+\.dist-info'.format(os.sep)
|
||||||
|
+ candidates = [os.path.join(sp, p) for p in os.listdir(sp)]
|
||||||
|
+ # filter out candidate dirs based on the above regexp
|
||||||
|
+ filtered = [c for c in candidates if re.match(dist_info_re, c)]
|
||||||
|
+ # if we have 0 or 2 or more dirs, something is wrong...
|
||||||
|
+ if len(filtered) == 1:
|
||||||
|
+ path = filtered[0]
|
||||||
|
+ if path is not None:
|
||||||
|
+ records.append(os.path.join(path, 'RECORD'))
|
||||||
|
+ else:
|
||||||
|
+ records.append(None)
|
||||||
|
+ return records
|
||||||
|
+
|
||||||
|
+def rewheel_from_record(record_path, outdir):
|
||||||
|
+ """Recreates a whee of package with given record_path and returns path
|
||||||
|
+ to the newly created wheel."""
|
||||||
|
+ site_dir = os.path.dirname(os.path.dirname(record_path))
|
||||||
|
+ record_relpath = record_path[len(site_dir):].strip(os.path.sep)
|
||||||
|
+ to_write, to_omit = get_records_to_pack(site_dir, record_relpath)
|
||||||
|
+ new_wheel_name = get_wheel_name(record_path)
|
||||||
|
+ new_wheel_path = os.path.join(outdir, new_wheel_name + '.whl')
|
||||||
|
+
|
||||||
|
+ new_wheel = zipfile.ZipFile(new_wheel_path, mode='w', compression=zipfile.ZIP_DEFLATED)
|
||||||
|
+ # we need to write a new record with just the files that we will write,
|
||||||
|
+ # e.g. not binaries and *.pyc/*.pyo files
|
||||||
|
+ new_record = io.StringIO()
|
||||||
|
+ writer = csv.writer(new_record)
|
||||||
|
+
|
||||||
|
+ # handle files that we can write straight away
|
||||||
|
+ for f, sha_hash, size in to_write:
|
||||||
|
+ new_wheel.write(os.path.join(site_dir, f), arcname=f)
|
||||||
|
+ writer.writerow([f, sha_hash,size])
|
||||||
|
+
|
||||||
|
+ # rewrite the old wheel file with a new computed one
|
||||||
|
+ writer.writerow([record_relpath, '', ''])
|
||||||
|
+ new_wheel.writestr(record_relpath, new_record.getvalue())
|
||||||
|
+
|
||||||
|
+ new_wheel.close()
|
||||||
|
+
|
||||||
|
+ return new_wheel.filename
|
||||||
|
+
|
||||||
|
+def get_wheel_name(record_path):
|
||||||
|
+ """Return proper name of the wheel, without .whl."""
|
||||||
|
+
|
||||||
|
+ wheel_info_path = os.path.join(os.path.dirname(record_path), 'WHEEL')
|
||||||
|
+ with codecs.open(wheel_info_path, encoding='utf-8') as wheel_info_file:
|
||||||
|
+ wheel_info = email.parser.Parser().parsestr(wheel_info_file.read())
|
||||||
|
+
|
||||||
|
+ metadata_path = os.path.join(os.path.dirname(record_path), 'METADATA')
|
||||||
|
+ with codecs.open(metadata_path, encoding='utf-8') as metadata_file:
|
||||||
|
+ metadata = email.parser.Parser().parsestr(metadata_file.read())
|
||||||
|
+
|
||||||
|
+ # construct name parts according to wheel spec
|
||||||
|
+ distribution = metadata.get('Name')
|
||||||
|
+ version = metadata.get('Version')
|
||||||
|
+ build_tag = '' # nothing for now
|
||||||
|
+ lang_tag = []
|
||||||
|
+ for t in wheel_info.get_all('Tag'):
|
||||||
|
+ lang_tag.append(t.split('-')[0])
|
||||||
|
+ lang_tag = '.'.join(lang_tag)
|
||||||
|
+ abi_tag, plat_tag = wheel_info.get('Tag').split('-')[1:3]
|
||||||
|
+ # leave out build tag, if it is empty
|
||||||
|
+ to_join = filter(None, [distribution, version, build_tag, lang_tag, abi_tag, plat_tag])
|
||||||
|
+ return '-'.join(list(to_join))
|
||||||
|
+
|
||||||
|
+def get_records_to_pack(site_dir, record_relpath):
|
||||||
|
+ """Accepts path of sitedir and path of RECORD file relative to it.
|
||||||
|
+ Returns two lists:
|
||||||
|
+ - list of files that can be written to new RECORD straight away
|
||||||
|
+ - list of files that shouldn't be written or need some processing
|
||||||
|
+ (pyc and pyo files, scripts)
|
||||||
|
+ """
|
||||||
|
+ record_file_path = os.path.join(site_dir, record_relpath)
|
||||||
|
+ with codecs.open(record_file_path, encoding='utf-8') as record_file:
|
||||||
|
+ record_contents = record_file.read()
|
||||||
|
+ # temporary fix for https://github.com/pypa/pip/issues/1376
|
||||||
|
+ # we need to ignore files under ".data" directory
|
||||||
|
+ data_dir = os.path.dirname(record_relpath).strip(os.path.sep)
|
||||||
|
+ data_dir = data_dir[:-len('dist-info')] + 'data'
|
||||||
|
+
|
||||||
|
+ to_write = []
|
||||||
|
+ to_omit = []
|
||||||
|
+ for l in record_contents.splitlines():
|
||||||
|
+ spl = l.split(',')
|
||||||
|
+ if len(spl) == 3:
|
||||||
|
+ # new record will omit (or write differently):
|
||||||
|
+ # - abs paths, paths with ".." (entry points),
|
||||||
|
+ # - pyc+pyo files
|
||||||
|
+ # - the old RECORD file
|
||||||
|
+ # TODO: is there any better way to recognize an entry point?
|
||||||
|
+ if os.path.isabs(spl[0]) or spl[0].startswith('..') or \
|
||||||
|
+ spl[0].endswith('.pyc') or spl[0].endswith('.pyo') or \
|
||||||
|
+ spl[0] == record_relpath or spl[0].startswith(data_dir):
|
||||||
|
+ to_omit.append(spl)
|
||||||
|
+ else:
|
||||||
|
+ to_write.append(spl)
|
||||||
|
+ else:
|
||||||
|
+ pass # bad RECORD or empty line
|
||||||
|
+ return to_write, to_omit
|
||||||
|
diff -Nur Python-3.4.1/Makefile.pre.in Python-3.4.1-rewheel/Makefile.pre.in
|
||||||
|
--- Python-3.4.1/Makefile.pre.in 2014-08-21 10:49:31.512695040 +0200
|
||||||
|
+++ Python-3.4.1-rewheel/Makefile.pre.in 2014-08-21 10:10:41.961341722 +0200
|
||||||
|
@@ -1145,7 +1145,7 @@
|
||||||
|
test/test_asyncio \
|
||||||
|
collections concurrent concurrent/futures encodings \
|
||||||
|
email email/mime test/test_email test/test_email/data \
|
||||||
|
- ensurepip ensurepip/_bundled \
|
||||||
|
+ ensurepip ensurepip/_bundled ensurepip/rewheel \
|
||||||
|
html json test/test_json http dbm xmlrpc \
|
||||||
|
sqlite3 sqlite3/test \
|
||||||
|
logging csv wsgiref urllib \
|
@ -1,70 +0,0 @@
|
|||||||
From 72d6cb277804f58b660bf96d8f5efff78d88491c Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Wed, 15 Aug 2018 15:36:29 +0200
|
|
||||||
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
|
|
||||||
|
|
||||||
We keep them in /usr/share/python-wheels
|
|
||||||
---
|
|
||||||
Lib/ensurepip/__init__.py | 32 ++++++++++++++++++++++----------
|
|
||||||
1 file changed, 22 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
|
|
||||||
index fc0edec6e3..731817a3f0 100644
|
|
||||||
--- a/Lib/ensurepip/__init__.py
|
|
||||||
+++ b/Lib/ensurepip/__init__.py
|
|
||||||
@@ -1,16 +1,31 @@
|
|
||||||
+import distutils.version
|
|
||||||
+import glob
|
|
||||||
import os
|
|
||||||
import os.path
|
|
||||||
-import pkgutil
|
|
||||||
import sys
|
|
||||||
import tempfile
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["version", "bootstrap"]
|
|
||||||
|
|
||||||
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
|
||||||
|
|
||||||
-_SETUPTOOLS_VERSION = "41.2.0"
|
|
||||||
+_wheels = {}
|
|
||||||
|
|
||||||
-_PIP_VERSION = "19.2.3"
|
|
||||||
+def _get_most_recent_wheel_version(pkg):
|
|
||||||
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
|
|
||||||
+ _wheels[pkg] = {}
|
|
||||||
+ for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":
|
|
||||||
+ pattern = "{}*{}".format(prefix, suffix)
|
|
||||||
+ for path in glob.glob(pattern):
|
|
||||||
+ version_str = path[len(prefix):-len(suffix)]
|
|
||||||
+ _wheels[pkg][version_str] = os.path.basename(path)
|
|
||||||
+ return str(max(_wheels[pkg], key=distutils.version.LooseVersion))
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
|
||||||
+
|
|
||||||
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
|
|
||||||
|
|
||||||
_PROJECTS = [
|
|
||||||
("setuptools", _SETUPTOOLS_VERSION),
|
|
||||||
@@ -95,13 +110,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
|
||||||
# additional paths that need added to sys.path
|
|
||||||
additional_paths = []
|
|
||||||
for project, version in _PROJECTS:
|
|
||||||
- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
|
|
||||||
- whl = pkgutil.get_data(
|
|
||||||
- "ensurepip",
|
|
||||||
- "_bundled/{}".format(wheel_name),
|
|
||||||
- )
|
|
||||||
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
|
||||||
- fp.write(whl)
|
|
||||||
+ wheel_name = _wheels[project][version]
|
|
||||||
+ with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
|
|
||||||
+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
|
||||||
+ fp.write(sfp.read())
|
|
||||||
|
|
||||||
additional_paths.append(os.path.join(tmpdir, wheel_name))
|
|
||||||
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
12
00205-make-libpl-respect-lib64.patch
Normal file
12
00205-make-libpl-respect-lib64.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up Python-3.5.0/Makefile.pre.in.lib Python-3.5.0/Makefile.pre.in
|
||||||
|
--- Python-3.5.0/Makefile.pre.in.lib 2015-09-21 15:39:47.928286620 +0200
|
||||||
|
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 15:42:58.004042762 +0200
|
||||||
|
@@ -1340,7 +1340,7 @@ inclinstall:
|
||||||
|
|
||||||
|
# Install the library and miscellaneous stuff needed for extending/embedding
|
||||||
|
# This goes into $(exec_prefix)
|
||||||
|
-LIBPL= @LIBPL@
|
||||||
|
+LIBPL= $(LIBDEST)/config-$(LDVERSION)-$(MULTIARCH)
|
||||||
|
|
||||||
|
# pkgconfig directory
|
||||||
|
LIBPC= $(LIBDIR)/pkgconfig
|
@ -1,35 +1,19 @@
|
|||||||
From a1f0ea8fae6fb87cdc9d9c16bc0898e8f66fa907 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Cyprian <m.cyprian@gmail.com>
|
|
||||||
Date: Mon, 26 Jun 2017 16:32:56 +0200
|
|
||||||
Subject: [PATCH] 00251: Change user install location
|
|
||||||
|
|
||||||
Set values of prefix and exec_prefix in distutils install command
|
|
||||||
to /usr/local if executable is /usr/bin/python* and RPM build
|
|
||||||
is not detected to make pip and distutils install into separate location.
|
|
||||||
|
|
||||||
Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
|
|
||||||
---
|
|
||||||
Lib/distutils/command/install.py | 15 +++++++++++++--
|
|
||||||
Lib/site.py | 9 ++++++++-
|
|
||||||
2 files changed, 21 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
|
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
|
||||||
index ae4f915669..0e4fd5b74a 100644
|
index 9d31d13..ed44a93 100644
|
||||||
--- a/Lib/distutils/command/install.py
|
--- a/Lib/distutils/command/install.py
|
||||||
+++ b/Lib/distutils/command/install.py
|
+++ b/Lib/distutils/command/install.py
|
||||||
@@ -418,8 +418,19 @@ class install(Command):
|
@@ -424,8 +424,18 @@ class install(Command):
|
||||||
raise DistutilsOptionError(
|
raise DistutilsOptionError(
|
||||||
"must not supply exec-prefix without prefix")
|
"must not supply exec-prefix without prefix")
|
||||||
|
|
||||||
- self.prefix = os.path.normpath(sys.prefix)
|
- self.prefix = os.path.normpath(sys.prefix)
|
||||||
- self.exec_prefix = os.path.normpath(sys.exec_prefix)
|
- self.exec_prefix = os.path.normpath(sys.exec_prefix)
|
||||||
+ # self.prefix is set to sys.prefix + /local/
|
+ # self.prefix is set to sys.prefix + /local/
|
||||||
+ # if neither RPM build nor virtual environment is
|
+ # if the executable is /usr/bin/python* and RPM build
|
||||||
+ # detected to make pip and distutils install packages
|
+ # is not detected to make pip and distutils install into
|
||||||
+ # into the separate location.
|
+ # the separate location.
|
||||||
+ if (not (hasattr(sys, 'real_prefix') or
|
+ if (sys.executable.startswith("/usr/bin/python")
|
||||||
+ sys.prefix != sys.base_prefix) and
|
+ and 'RPM_BUILD_ROOT' not in os.environ):
|
||||||
+ 'RPM_BUILD_ROOT' not in os.environ):
|
|
||||||
+ addition = "/local"
|
+ addition = "/local"
|
||||||
+ else:
|
+ else:
|
||||||
+ addition = ""
|
+ addition = ""
|
||||||
@ -40,25 +24,23 @@ index ae4f915669..0e4fd5b74a 100644
|
|||||||
else:
|
else:
|
||||||
if self.exec_prefix is None:
|
if self.exec_prefix is None:
|
||||||
diff --git a/Lib/site.py b/Lib/site.py
|
diff --git a/Lib/site.py b/Lib/site.py
|
||||||
index 22d53fa562..9513526109 100644
|
index 4744eb0..b5fe571 100644
|
||||||
--- a/Lib/site.py
|
--- a/Lib/site.py
|
||||||
+++ b/Lib/site.py
|
+++ b/Lib/site.py
|
||||||
@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
|
@@ -326,7 +326,15 @@ def getsitepackages(prefixes=None):
|
||||||
return sitepackages
|
return sitepackages
|
||||||
|
|
||||||
def addsitepackages(known_paths, prefixes=None):
|
def addsitepackages(known_paths, prefixes=None):
|
||||||
- """Add site-packages to sys.path"""
|
- """Add site-packages to sys.path"""
|
||||||
+ """Add site-packages to sys.path
|
+ """Add site-packages to sys.path.
|
||||||
+
|
+
|
||||||
+ '/usr/local' is included in PREFIXES if RPM build is not detected
|
+ '/usr/local' is included in PREFIXES if the executable is /usr/bin/python*
|
||||||
+ to make packages installed into this location visible.
|
+ and RPM build is not detected to make sudo pip installed packages visible.
|
||||||
+
|
+
|
||||||
+ """
|
+ """
|
||||||
+ if ENABLE_USER_SITE and 'RPM_BUILD_ROOT' not in os.environ:
|
+ if (ENABLE_USER_SITE and sys.executable.startswith("/usr/bin/python")
|
||||||
|
+ and 'RPM_BUILD_ROOT' not in os.environ):
|
||||||
+ PREFIXES.insert(0, "/usr/local")
|
+ PREFIXES.insert(0, "/usr/local")
|
||||||
for sitedir in getsitepackages(prefixes):
|
for sitedir in getsitepackages(prefixes):
|
||||||
if os.path.isdir(sitedir):
|
if os.path.isdir(sitedir):
|
||||||
addsitedir(sitedir, known_paths)
|
addsitedir(sitedir, known_paths)
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
|
1090
00262-pep538_coerce_legacy_c_locale.patch
Normal file
1090
00262-pep538_coerce_legacy_c_locale.patch
Normal file
File diff suppressed because it is too large
Load Diff
12
00264-skip-test-failing-on-aarch64.patch
Normal file
12
00264-skip-test-failing-on-aarch64.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py
|
||||||
|
index 3eded77..ad7859a 100644
|
||||||
|
--- a/Lib/ctypes/test/test_structures.py
|
||||||
|
+++ b/Lib/ctypes/test/test_structures.py
|
||||||
|
@@ -392,6 +392,7 @@ class StructureTestCase(unittest.TestCase):
|
||||||
|
(1, 0, 0, 0, 0, 0))
|
||||||
|
self.assertRaises(TypeError, lambda: Z(1, 2, 3, 4, 5, 6, 7))
|
||||||
|
|
||||||
|
+ @unittest.skip('Fails on aarch64: http://bugs.python.org/issue29804')
|
||||||
|
def test_pass_by_value(self):
|
||||||
|
# This should mirror the structure in Modules/_ctypes/_ctypes_test.c
|
||||||
|
class X(Structure):
|
16
00270-fix-ssl-alpn-hook-test.patch
Normal file
16
00270-fix-ssl-alpn-hook-test.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||||
|
index d203cdd..c128dae 100644
|
||||||
|
--- a/Lib/test/test_ssl.py
|
||||||
|
+++ b/Lib/test/test_ssl.py
|
||||||
|
@@ -3256,8 +3256,9 @@ if _have_threads:
|
||||||
|
except ssl.SSLError as e:
|
||||||
|
stats = e
|
||||||
|
|
||||||
|
- if expected is None and IS_OPENSSL_1_1:
|
||||||
|
- # OpenSSL 1.1.0 raises handshake error
|
||||||
|
+ if (expected is None and IS_OPENSSL_1_1
|
||||||
|
+ and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)):
|
||||||
|
+ # OpenSSL 1.1.0 to 1.1.0e raises handshake error
|
||||||
|
self.assertIsInstance(stats, ssl.SSLError)
|
||||||
|
else:
|
||||||
|
msg = "failed trying %s (s) and %s (c).\n" \
|
99
00271-asyncio-get-default-signal-handler.patch
Normal file
99
00271-asyncio-get-default-signal-handler.patch
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
|
||||||
|
index 492a84a2313..9746678607c 100644
|
||||||
|
--- a/Lib/test/test_asyncio/test_events.py
|
||||||
|
+++ b/Lib/test/test_asyncio/test_events.py
|
||||||
|
@@ -1980,19 +1980,26 @@ def test_subprocess_terminate(self):
|
||||||
|
|
||||||
|
@unittest.skipIf(sys.platform == 'win32', "Don't have SIGHUP")
|
||||||
|
def test_subprocess_send_signal(self):
|
||||||
|
- prog = os.path.join(os.path.dirname(__file__), 'echo.py')
|
||||||
|
-
|
||||||
|
- connect = self.loop.subprocess_exec(
|
||||||
|
- functools.partial(MySubprocessProtocol, self.loop),
|
||||||
|
- sys.executable, prog)
|
||||||
|
- transp, proto = self.loop.run_until_complete(connect)
|
||||||
|
- self.assertIsInstance(proto, MySubprocessProtocol)
|
||||||
|
- self.loop.run_until_complete(proto.connected)
|
||||||
|
-
|
||||||
|
- transp.send_signal(signal.SIGHUP)
|
||||||
|
- self.loop.run_until_complete(proto.completed)
|
||||||
|
- self.assertEqual(-signal.SIGHUP, proto.returncode)
|
||||||
|
- transp.close()
|
||||||
|
+ # bpo-31034: Make sure that we get the default signal handler (killing
|
||||||
|
+ # the process). The parent process may have decided to ignore SIGHUP,
|
||||||
|
+ # and signal handlers are inherited.
|
||||||
|
+ old_handler = signal.signal(signal.SIGHUP, signal.SIG_DFL)
|
||||||
|
+ try:
|
||||||
|
+ prog = os.path.join(os.path.dirname(__file__), 'echo.py')
|
||||||
|
+
|
||||||
|
+ connect = self.loop.subprocess_exec(
|
||||||
|
+ functools.partial(MySubprocessProtocol, self.loop),
|
||||||
|
+ sys.executable, prog)
|
||||||
|
+ transp, proto = self.loop.run_until_complete(connect)
|
||||||
|
+ self.assertIsInstance(proto, MySubprocessProtocol)
|
||||||
|
+ self.loop.run_until_complete(proto.connected)
|
||||||
|
+
|
||||||
|
+ transp.send_signal(signal.SIGHUP)
|
||||||
|
+ self.loop.run_until_complete(proto.completed)
|
||||||
|
+ self.assertEqual(-signal.SIGHUP, proto.returncode)
|
||||||
|
+ transp.close()
|
||||||
|
+ finally:
|
||||||
|
+ signal.signal(signal.SIGHUP, old_handler)
|
||||||
|
|
||||||
|
def test_subprocess_stderr(self):
|
||||||
|
prog = os.path.join(os.path.dirname(__file__), 'echo2.py')
|
||||||
|
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
|
||||||
|
index 2e14a8a9735..e8822c36698 100644
|
||||||
|
--- a/Lib/test/test_asyncio/test_subprocess.py
|
||||||
|
+++ b/Lib/test/test_asyncio/test_subprocess.py
|
||||||
|
@@ -166,25 +166,32 @@ def test_terminate(self):
|
||||||
|
|
||||||
|
@unittest.skipIf(sys.platform == 'win32', "Don't have SIGHUP")
|
||||||
|
def test_send_signal(self):
|
||||||
|
- code = 'import time; print("sleeping", flush=True); time.sleep(3600)'
|
||||||
|
- args = [sys.executable, '-c', code]
|
||||||
|
- create = asyncio.create_subprocess_exec(*args,
|
||||||
|
- stdout=subprocess.PIPE,
|
||||||
|
- loop=self.loop)
|
||||||
|
- proc = self.loop.run_until_complete(create)
|
||||||
|
-
|
||||||
|
- @asyncio.coroutine
|
||||||
|
- def send_signal(proc):
|
||||||
|
- # basic synchronization to wait until the program is sleeping
|
||||||
|
- line = yield from proc.stdout.readline()
|
||||||
|
- self.assertEqual(line, b'sleeping\n')
|
||||||
|
+ # bpo-31034: Make sure that we get the default signal handler (killing
|
||||||
|
+ # the process). The parent process may have decided to ignore SIGHUP,
|
||||||
|
+ # and signal handlers are inherited.
|
||||||
|
+ old_handler = signal.signal(signal.SIGHUP, signal.SIG_DFL)
|
||||||
|
+ try:
|
||||||
|
+ code = 'import time; print("sleeping", flush=True); time.sleep(3600)'
|
||||||
|
+ args = [sys.executable, '-c', code]
|
||||||
|
+ create = asyncio.create_subprocess_exec(*args,
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ loop=self.loop)
|
||||||
|
+ proc = self.loop.run_until_complete(create)
|
||||||
|
|
||||||
|
- proc.send_signal(signal.SIGHUP)
|
||||||
|
- returncode = (yield from proc.wait())
|
||||||
|
- return returncode
|
||||||
|
-
|
||||||
|
- returncode = self.loop.run_until_complete(send_signal(proc))
|
||||||
|
- self.assertEqual(-signal.SIGHUP, returncode)
|
||||||
|
+ @asyncio.coroutine
|
||||||
|
+ def send_signal(proc):
|
||||||
|
+ # basic synchronization to wait until the program is sleeping
|
||||||
|
+ line = yield from proc.stdout.readline()
|
||||||
|
+ self.assertEqual(line, b'sleeping\n')
|
||||||
|
+
|
||||||
|
+ proc.send_signal(signal.SIGHUP)
|
||||||
|
+ returncode = (yield from proc.wait())
|
||||||
|
+ return returncode
|
||||||
|
+
|
||||||
|
+ returncode = self.loop.run_until_complete(send_signal(proc))
|
||||||
|
+ self.assertEqual(-signal.SIGHUP, returncode)
|
||||||
|
+ finally:
|
||||||
|
+ signal.signal(signal.SIGHUP, old_handler)
|
||||||
|
|
||||||
|
def prepare_broken_pipe_test(self):
|
||||||
|
# buffer large enough to feed the whole pipe buffer
|
58
00272-fix-ftplib-to-reject-newlines.patch
Normal file
58
00272-fix-ftplib-to-reject-newlines.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
From 8c2d4cf092c5f0335e7982392a33927579c4d512 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dong-hee Na <donghee.na92@gmail.com>
|
||||||
|
Date: Wed, 26 Jul 2017 21:11:25 +0900
|
||||||
|
Subject: [PATCH] [3.6] bpo-30119: fix ftplib.FTP.putline() to throw an error
|
||||||
|
for a illegal command (#1214) (#2886)
|
||||||
|
|
||||||
|
---
|
||||||
|
Lib/ftplib.py | 2 ++
|
||||||
|
Lib/test/test_ftplib.py | 6 +++++-
|
||||||
|
Misc/NEWS.d/next/Library/2017-07-26-15-15-00.bpo-30119.DZ6C_S.rst | 2 ++
|
||||||
|
3 files changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Library/2017-07-26-15-15-00.bpo-30119.DZ6C_S.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
|
||||||
|
index 8f36f537e8a..a02e595cb02 100644
|
||||||
|
--- a/Lib/ftplib.py
|
||||||
|
+++ b/Lib/ftplib.py
|
||||||
|
@@ -186,6 +186,8 @@ def sanitize(self, s):
|
||||||
|
|
||||||
|
# Internal: send one line to the server, appending CRLF
|
||||||
|
def putline(self, line):
|
||||||
|
+ if '\r' in line or '\n' in line:
|
||||||
|
+ raise ValueError('an illegal newline character should not be contained')
|
||||||
|
line = line + CRLF
|
||||||
|
if self.debugging > 1:
|
||||||
|
print('*put*', self.sanitize(line))
|
||||||
|
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
|
||||||
|
index 12fabc5e8be..a561e9efa03 100644
|
||||||
|
--- a/Lib/test/test_ftplib.py
|
||||||
|
+++ b/Lib/test/test_ftplib.py
|
||||||
|
@@ -484,6 +484,9 @@ def test_sanitize(self):
|
||||||
|
self.assertEqual(self.client.sanitize('PASS 12345'), repr('PASS *****'))
|
||||||
|
|
||||||
|
def test_exceptions(self):
|
||||||
|
+ self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r\n0')
|
||||||
|
+ self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\n0')
|
||||||
|
+ self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r0')
|
||||||
|
self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 400')
|
||||||
|
self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 499')
|
||||||
|
self.assertRaises(ftplib.error_perm, self.client.sendcmd, 'echo 500')
|
||||||
|
@@ -492,7 +495,8 @@ def test_exceptions(self):
|
||||||
|
|
||||||
|
def test_all_errors(self):
|
||||||
|
exceptions = (ftplib.error_reply, ftplib.error_temp, ftplib.error_perm,
|
||||||
|
- ftplib.error_proto, ftplib.Error, OSError, EOFError)
|
||||||
|
+ ftplib.error_proto, ftplib.Error, OSError,
|
||||||
|
+ EOFError)
|
||||||
|
for x in exceptions:
|
||||||
|
try:
|
||||||
|
raise x('exception not included in all_errors set')
|
||||||
|
diff --git a/Misc/NEWS.d/next/Library/2017-07-26-15-15-00.bpo-30119.DZ6C_S.rst b/Misc/NEWS.d/next/Library/2017-07-26-15-15-00.bpo-30119.DZ6C_S.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..a37d3703842
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Library/2017-07-26-15-15-00.bpo-30119.DZ6C_S.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+ftplib.FTP.putline() now throws ValueError on commands that contains CR or
|
||||||
|
+LF. Patch by Dong-hee Na.
|
12
00273-skip-float-test.patch
Normal file
12
00273-skip-float-test.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
|
||||||
|
index 66726d6496d..3318fa5df59 100644
|
||||||
|
--- a/Lib/test/test_float.py
|
||||||
|
+++ b/Lib/test/test_float.py
|
||||||
|
@@ -141,6 +141,7 @@ class GeneralFloatCases(unittest.TestCase):
|
||||||
|
# non-UTF-8 byte string
|
||||||
|
check(b'123\xa0')
|
||||||
|
|
||||||
|
+ @unittest.skip('Fails in Koji: https://bugzilla.redhat.com/show_bug.cgi?id=1484497')
|
||||||
|
@support.run_with_locale('LC_NUMERIC', 'fr_FR', 'de_DE')
|
||||||
|
def test_float_with_comma(self):
|
||||||
|
# set locale to something that doesn't use '.' for the decimal point
|
@ -1,38 +1,7 @@
|
|||||||
From b60a8fee7e91e36b48a2ea27d1bb9f42642c3eb2 Mon Sep 17 00:00:00 2001
|
diff -up Python-3.5.0/configure.ac.than Python-3.5.0/configure.ac
|
||||||
From: Petr Viktorin <pviktori@redhat.com>
|
--- Python-3.5.0/configure.ac.than 2015-11-13 11:51:32.039560172 -0500
|
||||||
Date: Mon, 28 Aug 2017 17:16:46 +0200
|
+++ Python-3.5.0/configure.ac 2015-11-13 11:52:11.670168157 -0500
|
||||||
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
|
@@ -788,9 +788,9 @@ cat >> conftest.c <<EOF
|
||||||
to match Fedora
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Co-authored-by: Petr Viktorin <pviktori@redhat.com>
|
|
||||||
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
||||||
Co-authored-by: Tomas Orsava <torsava@redhat.com>
|
|
||||||
---
|
|
||||||
config.sub | 2 +-
|
|
||||||
configure.ac | 16 ++++++++--------
|
|
||||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.sub b/config.sub
|
|
||||||
index ba37cf99e2..52a9ec6662 100755
|
|
||||||
--- a/config.sub
|
|
||||||
+++ b/config.sub
|
|
||||||
@@ -1042,7 +1042,7 @@ case $basic_machine in
|
|
||||||
;;
|
|
||||||
ppc64) basic_machine=powerpc64-unknown
|
|
||||||
;;
|
|
||||||
- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
|
||||||
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
|
||||||
;;
|
|
||||||
ppc64le | powerpc64little)
|
|
||||||
basic_machine=powerpc64le-unknown
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index c59cbc223f..a3e1c04e1b 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -747,9 +747,9 @@ cat >> conftest.c <<EOF
|
|
||||||
alpha-linux-gnu
|
alpha-linux-gnu
|
||||||
# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
|
# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
|
||||||
# if defined(__ARMEL__)
|
# if defined(__ARMEL__)
|
||||||
@ -44,7 +13,7 @@ index c59cbc223f..a3e1c04e1b 100644
|
|||||||
# endif
|
# endif
|
||||||
# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
|
# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
|
||||||
# if defined(__ARMEL__)
|
# if defined(__ARMEL__)
|
||||||
@@ -789,7 +789,7 @@ cat >> conftest.c <<EOF
|
@@ -810,7 +810,7 @@ cat >> conftest.c <<EOF
|
||||||
# elif _MIPS_SIM == _ABIN32
|
# elif _MIPS_SIM == _ABIN32
|
||||||
mips64el-linux-gnuabin32
|
mips64el-linux-gnuabin32
|
||||||
# elif _MIPS_SIM == _ABI64
|
# elif _MIPS_SIM == _ABI64
|
||||||
@ -53,7 +22,7 @@ index c59cbc223f..a3e1c04e1b 100644
|
|||||||
# else
|
# else
|
||||||
# error unknown platform triplet
|
# error unknown platform triplet
|
||||||
# endif
|
# endif
|
||||||
@@ -799,22 +799,22 @@ cat >> conftest.c <<EOF
|
@@ -820,7 +820,7 @@ cat >> conftest.c <<EOF
|
||||||
# elif _MIPS_SIM == _ABIN32
|
# elif _MIPS_SIM == _ABIN32
|
||||||
mips64-linux-gnuabin32
|
mips64-linux-gnuabin32
|
||||||
# elif _MIPS_SIM == _ABI64
|
# elif _MIPS_SIM == _ABI64
|
||||||
@ -62,11 +31,8 @@ index c59cbc223f..a3e1c04e1b 100644
|
|||||||
# else
|
# else
|
||||||
# error unknown platform triplet
|
# error unknown platform triplet
|
||||||
# endif
|
# endif
|
||||||
# elif defined(__or1k__)
|
@@ -830,9 +830,9 @@ cat >> conftest.c <<EOF
|
||||||
or1k-linux-gnu
|
powerpc-linux-gnuspe
|
||||||
# elif defined(__powerpc__) && defined(__SPE__)
|
|
||||||
- powerpc-linux-gnuspe
|
|
||||||
+ ppc-linux-gnuspe
|
|
||||||
# elif defined(__powerpc64__)
|
# elif defined(__powerpc64__)
|
||||||
# if defined(__LITTLE_ENDIAN__)
|
# if defined(__LITTLE_ENDIAN__)
|
||||||
- powerpc64le-linux-gnu
|
- powerpc64le-linux-gnu
|
||||||
@ -76,11 +42,17 @@ index c59cbc223f..a3e1c04e1b 100644
|
|||||||
+ ppc64-linux-gnu
|
+ ppc64-linux-gnu
|
||||||
# endif
|
# endif
|
||||||
# elif defined(__powerpc__)
|
# elif defined(__powerpc__)
|
||||||
- powerpc-linux-gnu
|
powerpc-linux-gnu
|
||||||
+ ppc-linux-gnu
|
diff --git a/config.sub b/config.sub
|
||||||
# elif defined(__s390x__)
|
index 40ea5df..932128b 100755
|
||||||
s390x-linux-gnu
|
--- a/config.sub
|
||||||
# elif defined(__s390__)
|
+++ b/config.sub
|
||||||
--
|
@@ -1045,7 +1045,7 @@ case $basic_machine in
|
||||||
2.24.1
|
;;
|
||||||
|
ppc64) basic_machine=powerpc64-unknown
|
||||||
|
;;
|
||||||
|
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
;;
|
||||||
|
ppc64le | powerpc64little)
|
||||||
|
basic_machine=powerpc64le-unknown
|
||||||
|
@ -1,55 +0,0 @@
|
|||||||
From 0d41a311e805af08637e3f6dc0fb6fae32e508ab Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Thu, 11 Jul 2019 13:44:13 +0200
|
|
||||||
Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
|
|
||||||
in rpmbuild
|
|
||||||
|
|
||||||
Since Fedora 31, the $SOURCE_DATE_EPOCH is set in rpmbuild to the latest
|
|
||||||
%changelog date. This makes Python default to the CHECKED_HASH pyc
|
|
||||||
invalidation mode, bringing more reproducible builds traded for an import
|
|
||||||
performance decrease. To avoid that, we don't default to CHECKED_HASH
|
|
||||||
when $RPM_BUILD_ROOT is set (i.e. when we are building RPM packages).
|
|
||||||
|
|
||||||
See https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/57#comment-27426
|
|
||||||
---
|
|
||||||
Lib/py_compile.py | 3 ++-
|
|
||||||
Lib/test/test_py_compile.py | 2 ++
|
|
||||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Lib/py_compile.py b/Lib/py_compile.py
|
|
||||||
index 21736896af..310bed5620 100644
|
|
||||||
--- a/Lib/py_compile.py
|
|
||||||
+++ b/Lib/py_compile.py
|
|
||||||
@@ -70,7 +70,8 @@ class PycInvalidationMode(enum.Enum):
|
|
||||||
|
|
||||||
|
|
||||||
def _get_default_invalidation_mode():
|
|
||||||
- if os.environ.get('SOURCE_DATE_EPOCH'):
|
|
||||||
+ if (os.environ.get('SOURCE_DATE_EPOCH') and not
|
|
||||||
+ os.environ.get('RPM_BUILD_ROOT')):
|
|
||||||
return PycInvalidationMode.CHECKED_HASH
|
|
||||||
else:
|
|
||||||
return PycInvalidationMode.TIMESTAMP
|
|
||||||
diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
|
|
||||||
index d4a68c9320..ed09874023 100644
|
|
||||||
--- a/Lib/test/test_py_compile.py
|
|
||||||
+++ b/Lib/test/test_py_compile.py
|
|
||||||
@@ -17,6 +17,7 @@ def without_source_date_epoch(fxn):
|
|
||||||
def wrapper(*args, **kwargs):
|
|
||||||
with support.EnvironmentVarGuard() as env:
|
|
||||||
env.unset('SOURCE_DATE_EPOCH')
|
|
||||||
+ env.unset('RPM_BUILD_ROOT')
|
|
||||||
return fxn(*args, **kwargs)
|
|
||||||
return wrapper
|
|
||||||
|
|
||||||
@@ -27,6 +28,7 @@ def with_source_date_epoch(fxn):
|
|
||||||
def wrapper(*args, **kwargs):
|
|
||||||
with support.EnvironmentVarGuard() as env:
|
|
||||||
env['SOURCE_DATE_EPOCH'] = '123456789'
|
|
||||||
+ env.unset('RPM_BUILD_ROOT')
|
|
||||||
return fxn(*args, **kwargs)
|
|
||||||
return wrapper
|
|
||||||
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
60
check-pyc-and-pyo-timestamps.py
Normal file
60
check-pyc-and-pyo-timestamps.py
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
"""Checks if all *.pyc and *.pyo files have later mtime than their *.py files."""
|
||||||
|
|
||||||
|
import imp
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# list of test and other files that we expect not to have bytecode
|
||||||
|
not_compiled = [
|
||||||
|
'/usr/bin/pathfix.py',
|
||||||
|
'test/bad_coding.py',
|
||||||
|
'test/bad_coding2.py',
|
||||||
|
'test/badsyntax_3131.py',
|
||||||
|
'test/badsyntax_future3.py',
|
||||||
|
'test/badsyntax_future4.py',
|
||||||
|
'test/badsyntax_future5.py',
|
||||||
|
'test/badsyntax_future6.py',
|
||||||
|
'test/badsyntax_future7.py',
|
||||||
|
'test/badsyntax_future8.py',
|
||||||
|
'test/badsyntax_future9.py',
|
||||||
|
'test/badsyntax_future10.py',
|
||||||
|
'test/badsyntax_async1.py',
|
||||||
|
'test/badsyntax_async2.py',
|
||||||
|
'test/badsyntax_async3.py',
|
||||||
|
'test/badsyntax_async4.py',
|
||||||
|
'test/badsyntax_async5.py',
|
||||||
|
'test/badsyntax_async6.py',
|
||||||
|
'test/badsyntax_async7.py',
|
||||||
|
'test/badsyntax_async8.py',
|
||||||
|
'test/badsyntax_async9.py',
|
||||||
|
'test/badsyntax_pep3120.py',
|
||||||
|
'lib2to3/tests/data/bom.py',
|
||||||
|
'lib2to3/tests/data/crlf.py',
|
||||||
|
'lib2to3/tests/data/different_encoding.py',
|
||||||
|
'lib2to3/tests/data/false_encoding.py',
|
||||||
|
'lib2to3/tests/data/py2_test_grammar.py',
|
||||||
|
'.debug-gdb.py',
|
||||||
|
]
|
||||||
|
failed = 0
|
||||||
|
|
||||||
|
def bytecode_expected(source):
|
||||||
|
for f in not_compiled:
|
||||||
|
if source.endswith(f):
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
compiled = filter(lambda f: bytecode_expected(f), sys.argv[1:])
|
||||||
|
for f in compiled:
|
||||||
|
# check both pyo and pyc
|
||||||
|
to_check = map(lambda b: imp.cache_from_source(f, b), (True, False))
|
||||||
|
f_mtime = os.path.getmtime(f)
|
||||||
|
for c in to_check:
|
||||||
|
c_mtime = os.path.getmtime(c)
|
||||||
|
if c_mtime < f_mtime:
|
||||||
|
sys.stderr.write('Failed bytecompilation timestamps check: ')
|
||||||
|
sys.stderr.write('Bytecode file {} is older than source file {}.\n'.format(c, f))
|
||||||
|
failed += 1
|
||||||
|
|
||||||
|
if failed:
|
||||||
|
sys.stderr.write('\n{} files failed bytecompilation timestamps check.\n'.format(failed))
|
||||||
|
sys.exit(1)
|
@ -1,55 +0,0 @@
|
|||||||
"""Checks if all *.pyc files have later mtime than their *.py files."""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from importlib.util import cache_from_source
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
|
|
||||||
RPM_BUILD_ROOT = os.environ.get('RPM_BUILD_ROOT', '')
|
|
||||||
|
|
||||||
# ...cpython-3X.pyc
|
|
||||||
# ...cpython-3X.opt-1.pyc
|
|
||||||
# ...cpython-3X.opt-2.pyc
|
|
||||||
LEVELS = (None, 1, 2)
|
|
||||||
|
|
||||||
# list of globs of test and other files that we expect not to have bytecode
|
|
||||||
not_compiled = [
|
|
||||||
'/usr/bin/*',
|
|
||||||
'*/test/bad_coding.py',
|
|
||||||
'*/test/bad_coding2.py',
|
|
||||||
'*/test/badsyntax_*.py',
|
|
||||||
'*/lib2to3/tests/data/bom.py',
|
|
||||||
'*/lib2to3/tests/data/crlf.py',
|
|
||||||
'*/lib2to3/tests/data/different_encoding.py',
|
|
||||||
'*/lib2to3/tests/data/false_encoding.py',
|
|
||||||
'*/lib2to3/tests/data/py2_test_grammar.py',
|
|
||||||
'*.debug-gdb.py',
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def bytecode_expected(path):
|
|
||||||
path = Path(path[len(RPM_BUILD_ROOT):])
|
|
||||||
for glob in not_compiled:
|
|
||||||
if path.match(glob):
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
failed = 0
|
|
||||||
compiled = (path for path in sys.argv[1:] if bytecode_expected(path))
|
|
||||||
for path in compiled:
|
|
||||||
to_check = (cache_from_source(path, optimization=opt) for opt in LEVELS)
|
|
||||||
f_mtime = os.path.getmtime(path)
|
|
||||||
for pyc in to_check:
|
|
||||||
c_mtime = os.path.getmtime(pyc)
|
|
||||||
if c_mtime < f_mtime:
|
|
||||||
print('Failed bytecompilation timestamps check: '
|
|
||||||
f'Bytecode file {pyc} is older than source file {path}',
|
|
||||||
file=sys.stderr)
|
|
||||||
failed += 1
|
|
||||||
|
|
||||||
if failed:
|
|
||||||
print(f'\n{failed} files failed bytecompilation timestamps check.',
|
|
||||||
file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
17
libpython.stp
Normal file
17
libpython.stp
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
/* Systemtap tapset to make it easier to trace Python */
|
||||||
|
|
||||||
|
/*
|
||||||
|
Define python.function.entry/return:
|
||||||
|
*/
|
||||||
|
probe python.function.entry = process("python3").library("LIBRARY_PATH").mark("function__entry")
|
||||||
|
{
|
||||||
|
filename = user_string($arg1);
|
||||||
|
funcname = user_string($arg2);
|
||||||
|
lineno = $arg3;
|
||||||
|
}
|
||||||
|
probe python.function.return = process("python3").library("LIBRARY_PATH").mark("function__return")
|
||||||
|
{
|
||||||
|
filename = user_string($arg1);
|
||||||
|
funcname = user_string($arg2);
|
||||||
|
lineno = $arg3;
|
||||||
|
}
|
10
macros.pybytecompile3.6
Normal file
10
macros.pybytecompile3.6
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# Note that the path could itself be a python file, or a directory
|
||||||
|
|
||||||
|
# Python's compile_all module only works on directories, and requires a max
|
||||||
|
# recursion depth
|
||||||
|
|
||||||
|
%py_byte_compile()\
|
||||||
|
python_binary="%1"\
|
||||||
|
bytecode_compilation_path="%2"\
|
||||||
|
find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2], optimize=opt) for opt in range(2) for f in sys.argv[1:]]' || :\
|
||||||
|
%{nil}
|
1
macros.systempython
Normal file
1
macros.systempython
Normal file
@ -0,0 +1 @@
|
|||||||
|
%system_python_abi %{expand: }
|
11542
pubkeys.txt
11542
pubkeys.txt
File diff suppressed because it is too large
Load Diff
21
pyfuntop.stp
Normal file
21
pyfuntop.stp
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
#!/usr/bin/stap
|
||||||
|
|
||||||
|
global fn_calls;
|
||||||
|
|
||||||
|
probe python.function.entry
|
||||||
|
{
|
||||||
|
fn_calls[pid(), filename, funcname, lineno] += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
probe timer.ms(1000) {
|
||||||
|
printf("\033[2J\033[1;1H") /* clear screen */
|
||||||
|
printf("%6s %80s %6s %30s %6s\n",
|
||||||
|
"PID", "FILENAME", "LINE", "FUNCTION", "CALLS")
|
||||||
|
foreach ([pid, filename, funcname, lineno] in fn_calls- limit 20) {
|
||||||
|
printf("%6d %80s %6d %30s %6d\n",
|
||||||
|
pid, filename, lineno, funcname,
|
||||||
|
fn_calls[pid, filename, funcname, lineno]);
|
||||||
|
}
|
||||||
|
|
||||||
|
delete fn_calls;
|
||||||
|
}
|
1380
python-gdb.py
Normal file
1380
python-gdb.py
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,84 +0,0 @@
|
|||||||
# KNOWN BUGS:
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1489816
|
|
||||||
addFilter(r'crypto-policy-non-compliance-openssl')
|
|
||||||
|
|
||||||
|
|
||||||
# TESTS:
|
|
||||||
addFilter(r'(zero-length|pem-certificate|uncompressed-zip) /usr/lib(64)?/python3\.\d+/test')
|
|
||||||
|
|
||||||
|
|
||||||
# OTHER DELIBERATES:
|
|
||||||
# chroot function
|
|
||||||
addFilter(r'missing-call-to-chdir-with-chroot')
|
|
||||||
|
|
||||||
# intentionally unversioned and selfobsoleted
|
|
||||||
addFilter(r'unversioned-explicit-obsoletes python')
|
|
||||||
addFilter(r'self-obsoletion python3\d+ obsoletes python3\d+')
|
|
||||||
|
|
||||||
# intentionally hardcoded
|
|
||||||
addFilter(r'hardcoded-library-path in %{_prefix}/lib/(debug/%{_libdir}|python%{pybasever})')
|
|
||||||
|
|
||||||
# intentional for our pythonXY package
|
|
||||||
addFilter(r'python3\d+\.[^:]+: (E|W): devel-file-in-non-devel-package')
|
|
||||||
|
|
||||||
# we have non binary stuff, python files
|
|
||||||
addFilter(r'only-non-binary-in-usr-lib')
|
|
||||||
|
|
||||||
# some devel files that are deliberately needed
|
|
||||||
addFilter(r'devel-file-in-non-devel-package /usr/include/python3\.\d+m?/pyconfig-(32|64)\.h')
|
|
||||||
addFilter(r'devel-file-in-non-devel-package /usr/lib(64)?/python3\.\d+/distutils/tests/xxmodule\.c')
|
|
||||||
|
|
||||||
|
|
||||||
# SORRY, NOT SORRY:
|
|
||||||
# manual pages
|
|
||||||
addFilter(r'no-manual-page-for-binary (idle|pydoc|pyvenv|2to3|python3?-debug|pathfix|msgfmt|pygettext)')
|
|
||||||
addFilter(r'no-manual-page-for-binary python3?.*-config$')
|
|
||||||
addFilter(r'no-manual-page-for-binary python3\.\d+d?m?$')
|
|
||||||
|
|
||||||
# missing documentation from subpackages
|
|
||||||
addFilter(r'^python3\d*-(debug|tkinter|test|idle)\.[^:]+: (E|W): no-documentation')
|
|
||||||
|
|
||||||
# platform python is obsoleted, but not provided
|
|
||||||
addFilter(r'obsolete-not-provided platform-python')
|
|
||||||
|
|
||||||
|
|
||||||
# RPMLINT IMPERFECTIONS
|
|
||||||
# https://github.com/rpm-software-management/rpmlint/issues/123
|
|
||||||
addFilter(r'python-bytecode-wrong-magic-value .* expected 33\d\d \(3\.7\), found 3393')
|
|
||||||
# https://github.com/rpm-software-management/rpmlint/pull/133
|
|
||||||
addFilter(r'python-bytecode-wrong-magic-value .* expected 33\d\d \(3\.7\), found 3394')
|
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1550562
|
|
||||||
# https://github.com/rpm-software-management/rpmlint/issues/128
|
|
||||||
addFilter(r'python-bytecode-inconsistent-mtime .* 1970')
|
|
||||||
|
|
||||||
# debugsource
|
|
||||||
addFilter(r'^python3\d*-debugsource\.[^:]+: (E|W): no-documentation')
|
|
||||||
|
|
||||||
# debuginfo
|
|
||||||
addFilter(r'^python3\d*-debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
|
|
||||||
|
|
||||||
# this is OK for F28+
|
|
||||||
addFilter(r'library-without-ldconfig-post')
|
|
||||||
|
|
||||||
# debug package contains devel and non-devel files
|
|
||||||
addFilter(r'python3\d*-debug\.[^:]+: (E|W): (non-)?devel-file-in-(non-)?devel-package')
|
|
||||||
|
|
||||||
# this goes to other subpackage, hence not actually dangling, the read error is bogus
|
|
||||||
addFilter(r'dangling-relative-symlink /usr/lib(64)?/pkgconfig/python-3\.\d+dm?(-embed)?\.pc python-3\.\d+(-embed)?\.pc')
|
|
||||||
addFilter(r'read-error /usr/lib(64)?/pkgconfig/python-3\.\d+dm?(-embed)?\.pc \[Errno 2\]')
|
|
||||||
|
|
||||||
# the python-unversioned-command package contains dangling symlinks by design
|
|
||||||
addFilter(r'^python-unversioned-command\.[^:]+: (E|W): dangling-relative-symlink '
|
|
||||||
r'(/usr/bin/python \./python3|/usr/share/man/man1/python\.1\S* ./python3\.1\S*)$')
|
|
||||||
|
|
||||||
# we need this macro to evaluate, even if the line starts with #
|
|
||||||
addFilter(r'macro-in-comment %\{_pyconfig(32|64)_h\}')
|
|
||||||
|
|
||||||
# Python modules don't need to be linked against libc
|
|
||||||
# Since 3.8 they are no longer linked against libpython3.8.so.1.0
|
|
||||||
addFilter(r'E: library-not-linked-against-libc /usr/lib(64)?/python3\.\d+/lib-dynload/')
|
|
||||||
addFilter(r'E: shared-lib-without-dependency-information /usr/lib(64)?/python3\.\d+/lib-dynload/')
|
|
||||||
|
|
||||||
# SPELLING ERRORS
|
|
||||||
addFilter(r'spelling-error .* en_US (bytecode|pyc|filename|tkinter|namespaces|pytest) ')
|
|
1546
python3.spec
1546
python3.spec
File diff suppressed because it is too large
Load Diff
3
sources
3
sources
@ -1,2 +1 @@
|
|||||||
SHA512 (Python-3.8.2.tar.xz) = ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
|
SHA512 (Python-3.6.2.tar.xz) = a8270a09a9e9b39f69ece6cdade2fa964665d2107b5acbad4453f1b921107b329c697c137185928fb4a576fc0f2ae2a98dbf26a8b7ea17219e990ddbc216db8b
|
||||||
SHA512 (Python-3.8.2.tar.xz.asc) = 765796ab5539576bbf1578e05cdb041dbc9a9ca0d6d2040a473a00a293b49f90be11ea6e33b47889da33b25f8e360fad4adeec292f0d43e5fae233d1f03bafd2
|
|
||||||
|
19
systemtap-example.stp
Normal file
19
systemtap-example.stp
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
Example usage of the Python systemtap tapset to show a nested view of all
|
||||||
|
Python function calls (and returns) across the whole system.
|
||||||
|
|
||||||
|
Run this using
|
||||||
|
stap systemtap-example.stp
|
||||||
|
to instrument all Python processes on the system, or (for example) using
|
||||||
|
stap systemtap-example.stp -c COMMAND
|
||||||
|
to instrument a specific program (implemented in Python)
|
||||||
|
*/
|
||||||
|
probe python.function.entry
|
||||||
|
{
|
||||||
|
printf("%s => %s in %s:%d\n", thread_indent(1), funcname, filename, lineno);
|
||||||
|
}
|
||||||
|
|
||||||
|
probe python.function.return
|
||||||
|
{
|
||||||
|
printf("%s <= %s in %s:%d\n", thread_indent(-1), funcname, filename, lineno);
|
||||||
|
}
|
@ -1 +0,0 @@
|
|||||||
1
|
|
@ -1,4 +0,0 @@
|
|||||||
---
|
|
||||||
standard-inventory-qcow2:
|
|
||||||
qemu:
|
|
||||||
m: 3G # Amount of VM memory
|
|
@ -1,34 +0,0 @@
|
|||||||
---
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
repositories:
|
|
||||||
- repo: "https://src.fedoraproject.org/tests/python.git"
|
|
||||||
dest: "python"
|
|
||||||
tests:
|
|
||||||
- smoke:
|
|
||||||
dir: python/smoke
|
|
||||||
run: VERSION=3.8 ./venv.sh
|
|
||||||
- debugsmoke:
|
|
||||||
dir: python/smoke
|
|
||||||
run: PYTHON=python3-debug TOX=false VERSION=3.8 ./venv.sh
|
|
||||||
- selftest:
|
|
||||||
dir: python/selftest
|
|
||||||
run: VERSION=3.8 X="-x test_wsgiref" ./parallel.sh
|
|
||||||
- debugtest:
|
|
||||||
dir: python/selftest
|
|
||||||
run: VERSION=3.8 PYTHON=python3-debug X="-x test_wsgiref" ./parallel.sh
|
|
||||||
- debugflags:
|
|
||||||
dir: python/flags
|
|
||||||
run: python3-debug ./assertflags.py -Og
|
|
||||||
required_packages:
|
|
||||||
- gcc # for extension building in venv and selftest
|
|
||||||
- gdb # for test_gdb
|
|
||||||
- python3-debug # for leak testing
|
|
||||||
- python3-devel # for extension building in venv and selftest
|
|
||||||
- python3-tkinter # for selftest
|
|
||||||
- python3-test # for selftest
|
|
||||||
- python3-tox # for venv tests
|
|
||||||
- glibc-all-langpacks # for locale tests
|
|
Loading…
Reference in New Issue
Block a user