63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
|
From 4f851142b8f3149d23654117621285df34ec768b Mon Sep 17 00:00:00 2001
|
||
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
Date: Wed, 23 Dec 2015 13:58:00 +0100
|
||
|
Subject: [PATCH] Support PGEN_FOR_BUILD and FREEZE_IMPORTLIB_FOR_BUILD
|
||
|
|
||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
---
|
||
|
Makefile.pre.in | 10 ++++++++++
|
||
|
configure.ac | 3 +++
|
||
|
2 files changed, 13 insertions(+)
|
||
|
|
||
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||
|
index 2466615..fdf622d 100644
|
||
|
--- a/Makefile.pre.in
|
||
|
+++ b/Makefile.pre.in
|
||
|
@@ -712,10 +712,15 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||
|
############################################################################
|
||
|
# Importlib
|
||
|
|
||
|
+ifeq (@FREEZE_IMPORTLIB_FOR_BUILD@,)
|
||
|
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
|
||
|
|
||
|
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
||
|
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||
|
+else
|
||
|
+Programs/_freeze_importlib: @FREEZE_IMPORTLIB_FOR_BUILD@
|
||
|
+ cp $^ $@
|
||
|
+endif
|
||
|
|
||
|
Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
|
||
|
./Programs/_freeze_importlib \
|
||
|
@@ -789,8 +794,13 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
|
||
|
$(GRAMMAR_C): $(GRAMMAR_H)
|
||
|
touch $(GRAMMAR_C)
|
||
|
|
||
|
+ifeq (@PGEN_FOR_BUILD@,)
|
||
|
$(PGEN): $(PGENOBJS)
|
||
|
$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
|
||
|
+else
|
||
|
+$(PGEN): @PGEN_FOR_BUILD@
|
||
|
+ cp $^ $@
|
||
|
+endif
|
||
|
|
||
|
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
|
||
|
$(srcdir)/Include/token.h \
|
||
|
diff --git a/configure.ac b/configure.ac
|
||
|
index c4c2353..750c232 100644
|
||
|
--- a/configure.ac
|
||
|
+++ b/configure.ac
|
||
|
@@ -79,6 +79,9 @@ else
|
||
|
fi
|
||
|
AC_SUBST(PYTHON_FOR_BUILD)
|
||
|
|
||
|
+AC_SUBST(PGEN_FOR_BUILD)
|
||
|
+AC_SUBST(FREEZE_IMPORTLIB_FOR_BUILD)
|
||
|
+
|
||
|
dnl Ensure that if prefix is specified, it does not end in a slash. If
|
||
|
dnl it does, we get path names containing '//' which is both ugly and
|
||
|
dnl can cause trouble.
|
||
|
--
|
||
|
2.6.4
|
||
|
|