Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbae33a0

Browse files
authored
Merge pull request#19386 from meeseeksmachine/auto-backport-of-pr-19238-on-v3.3.x
Backport PR#19238 on branch v3.3.x (Fix build with LTO disabled in environment)
2 parentsdb5b330 +81305b4 commitbae33a0

File tree

6 files changed

+34
-22
lines changed

6 files changed

+34
-22
lines changed

‎.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
python-version:3.7
3232
extra-requirements:'-r requirements/testing/travis_extra.txt'
3333
XVFB_RUN:xvfb-run -a
34+
CFLAGS:"-fno-lto"# Ensure that disabling LTO works.
3435
-os:ubuntu-16.04
3536
python-version:3.8
3637
extra-requirements:'-r requirements/testing/travis_extra.txt'

‎setup.py

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,34 @@ def add_optimization_flags(self):
103103
"""
104104

105105
env=os.environ.copy()
106-
ifnotsetupext.config.getboolean('libs','enable_lto',fallback=True):
107-
returnenv
108106
ifsys.platform=='win32':
109107
returnenv
110-
111-
cppflags= []
112-
if'CPPFLAGS'inos.environ:
113-
cppflags.append(os.environ['CPPFLAGS'])
114-
cxxflags= []
115-
if'CXXFLAGS'inos.environ:
116-
cxxflags.append(os.environ['CXXFLAGS'])
117-
ldflags= []
118-
if'LDFLAGS'inos.environ:
119-
ldflags.append(os.environ['LDFLAGS'])
108+
enable_lto=setupext.config.getboolean('libs','enable_lto',
109+
fallback=None)
110+
111+
defprepare_flags(name,enable_lto):
112+
"""
113+
Prepare *FLAGS from the environment.
114+
115+
If set, return them, and also check whether LTO is disabled in each
116+
one, raising an error if Matplotlib config explicitly enabled LTO.
117+
"""
118+
ifnameinos.environ:
119+
if'-fno-lto'inos.environ[name]:
120+
ifenable_ltoisTrue:
121+
raiseValueError('Configuration enable_lto=True, but '
122+
'{0} contains -fno-lto'.format(name))
123+
enable_lto=False
124+
return [os.environ[name]],enable_lto
125+
return [],enable_lto
126+
127+
_,enable_lto=prepare_flags('CFLAGS',enable_lto)# Only check lto.
128+
cppflags,enable_lto=prepare_flags('CPPFLAGS',enable_lto)
129+
cxxflags,enable_lto=prepare_flags('CXXFLAGS',enable_lto)
130+
ldflags,enable_lto=prepare_flags('LDFLAGS',enable_lto)
131+
132+
ifenable_ltoisFalse:
133+
returnenv
120134

121135
ifhas_flag(self.compiler,'-fvisibility=hidden'):
122136
forextinself.extensions:

‎setupext.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ def get_extensions(self):
399399
ext=Extension(
400400
"matplotlib.backends._tkagg", [
401401
"src/_tkagg.cpp",
402-
"src/py_converters.cpp",
403402
],
404403
include_dirs=["src"],
405404
# psapi library needed for finding Tcl/Tk at run time.

‎src/_tkagg.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@
3737

3838
// Include our own excerpts from the Tcl / Tk headers
3939
#include"_tkmini.h"
40-
#include"py_converters.h"
40+
41+
staticintconvert_voidptr(PyObject *obj,void *p)
42+
{
43+
void **val = (void **)p;
44+
*val =PyLong_AsVoidPtr(obj);
45+
return *val !=NULL ?1 : !PyErr_Occurred();
46+
}
4147

4248
// Global vars for Tk functions. We load these symbols from the tkinter
4349
// extension module or loaded Tk libraries at run-time.

‎src/py_converters.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ int convert_from_attr(PyObject *obj, const char *name, converter func, void *p)
9494
return1;
9595
}
9696

97-
intconvert_voidptr(PyObject *obj,void *p)
98-
{
99-
void **val = (void **)p;
100-
*val =PyLong_AsVoidPtr(obj);
101-
return *val !=NULL ?1 : !PyErr_Occurred();
102-
}
103-
10497
intconvert_double(PyObject *obj,void *p)
10598
{
10699
double *val = (double *)p;

‎src/py_converters.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ typedef int (*converter)(PyObject *, void *);
2222
intconvert_from_attr(PyObject *obj,constchar *name, converter func,void *p);
2323
intconvert_from_method(PyObject *obj,constchar *name, converter func,void *p);
2424

25-
intconvert_voidptr(PyObject *obj,void *p);
2625
intconvert_double(PyObject *obj,void *p);
2726
intconvert_bool(PyObject *obj,void *p);
2827
intconvert_cap(PyObject *capobj,void *capp);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp