Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1046d5c6
Commit
1046d5c6
authored
Apr 23, 2016
by
Martin Panter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #22359: Disable running cross-compiled _freeze_importlib and pgen
Patch by Xavier de Gaye.
parent
19620c57
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
7 deletions
+27
-7
Makefile.pre.in
Makefile.pre.in
+20
-7
Misc/NEWS
Misc/NEWS
+5
-0
configure
configure
+1
-0
configure.ac
configure.ac
+1
-0
No files found.
Makefile.pre.in
View file @
1046d5c6
...
...
@@ -221,6 +221,7 @@ LIBOBJS= @LIBOBJS@
PYTHON
=
python
$(EXE)
BUILDPYTHON
=
python
$(BUILDEXE)
cross_compiling
=
@cross_compiling@
PYTHON_FOR_BUILD
=
@PYTHON_FOR_BUILD@
_PYTHON_HOST_PLATFORM
=
@_PYTHON_HOST_PLATFORM@
BUILD_GNU_TYPE
=
@build@
...
...
@@ -718,12 +719,16 @@ Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FRO
$(LINKCC)
$(PY_LDFLAGS)
-o
$@
Programs/_freeze_importlib.o
$(LIBRARY_OBJS_OMIT_FROZEN)
$(LIBS)
$(MODLIBS)
$(SYSLIBS)
$(LDLAST)
Python/importlib_external.h
:
$(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
./Programs/_freeze_importlib
\
$(srcdir)
/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
if
test
"
$(cross_compiling)
"
!=
"yes"
;
then
\
./Programs/_freeze_importlib
\
$(srcdir)
/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
;
\
fi
Python/importlib.h
:
$(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
./Programs/_freeze_importlib
\
$(srcdir)
/Lib/importlib/_bootstrap.py Python/importlib.h
if
test
"
$(cross_compiling)
"
!=
"yes"
;
then
\
./Programs/_freeze_importlib
\
$(srcdir)
/Lib/importlib/_bootstrap.py Python/importlib.h
;
\
fi
############################################################################
...
...
@@ -784,10 +789,18 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
$(IO_OBJS)
:
$(IO_H)
$(GRAMMAR_H)
:
$(GRAMMAR_INPUT) $(PGEN)
@
$(MKDIR_P)
Include
$(PGEN)
$(GRAMMAR_INPUT)
$(GRAMMAR_H)
$(GRAMMAR_C)
@
$(MKDIR_P)
Include
if
test
"
$(cross_compiling)
"
!=
"yes"
;
then
\
$(PGEN)
$(GRAMMAR_INPUT)
$(GRAMMAR_H)
$(GRAMMAR_C)
;
\
else
\
cp
$(srcdir)
/Include/graminit.h
$(GRAMMAR_H)
;
\
fi
$(GRAMMAR_C)
:
$(GRAMMAR_H)
touch
$(GRAMMAR_C)
if
test
"
$(cross_compiling)
"
!=
"yes"
;
then
\
touch
$(GRAMMAR_C)
;
\
else
\
cp
$(srcdir)
/Python/graminit.c
$(GRAMMAR_C)
;
\
fi
$(PGEN)
:
$(PGENOBJS)
$(CC)
$(OPT)
$(PY_LDFLAGS)
$(PGENOBJS)
$(LIBS)
-o
$(PGEN)
...
...
Misc/NEWS
View file @
1046d5c6
...
...
@@ -404,6 +404,11 @@ Tests
Build
-----
-
Issue
#
22359
:
Disable
the
rules
for
running
_freeze_importlib
and
pgen
when
cross
-
compiling
.
The
output
of
these
programs
is
normally
saved
with
the
source
code
anyway
,
and
is
still
regenerated
when
doing
a
native
build
.
Patch
by
Xavier
de
Gaye
.
-
Issue
#
21668
:
Link
audioop
,
_datetime
,
_ctypes_test
modules
to
libm
,
except
on
Mac
OS
X
.
Patch
written
by
Xavier
de
Gaye
.
...
...
configure
View file @
1046d5c6
...
...
@@ -751,6 +751,7 @@ build_os
build_vendor
build_cpu
build
cross_compiling
HAS_HG
HGBRANCH
HGTAG
...
...
configure.ac
View file @
1046d5c6
...
...
@@ -49,6 +49,7 @@ fi
AC_CONFIG_SRCDIR([Include/object.h])
AC_CONFIG_HEADER(pyconfig.h)
AC_SUBST(cross_compiling)
AC_CANONICAL_HOST
AC_SUBST(build)
AC_SUBST(host)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment