python: no need to add HOSTPGEN

There's no need to patch in HOSTPGEN when we can just override PGEN directly.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
index e795a74b911b14e4e3f53df48d1a8eaca6b2a9f1..7d8e95fe5cc957550d660027c05bc23314d0e444 100644 (file)
--- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
+++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
@@ -16,14 +16,6 @@ Index: Python-2.7.13/Makefile.pre.in
 ===================================================================
 --- Python-2.7.13.orig/Makefile.pre.in
 +++ Python-2.7.13/Makefile.pre.in
-@@ -245,6 +245,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN=         Parser/pgen$(EXE)
-+HOSTPGEN=     $(PGEN)$(EXE)
- 
- PSRCS=                \
-               Parser/acceler.c \
 @@ -512,7 +513,7 @@ $(BUILDPYTHON):    Modules/python.o $(LIBRA
                        $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
@@ -33,15 +25,6 @@ Index: Python-2.7.13/Makefile.pre.in
  
  # Create build directory and generate the sysconfig build-time data there.
  # pybuilddir.txt contains the name of the build dir and is used for
-@@ -663,7 +663,7 @@
-       # Regenerate Include/graminit.h and Python/graminit.c
-       # from Grammar/Grammar using pgen
-       @$(MKDIR_P) Include
--      $(PGEN) $(srcdir)/Grammar/Grammar \
-+      $(HOSTPGEN) $(srcdir)/Grammar/Grammar \
-               $(srcdir)/Include/graminit.h \
-               $(srcdir)/Python/graminit.c
- 
 @@ -1121,27 +1122,27 @@ libinstall:    build_all $(srcdir)/Lib/$(PL
                        $(DESTDIR)$(LIBDEST)/distutils/tests ; \
        fi

diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb
index 5b856a50977d0fe6dbed4b6cc1a394f53b62d47b..6199a5da76068119d48e1c2bb70cbfa37488952e 100644 (file)
--- a/meta/recipes-devtools/python/python_2.7.17.bb
+++ b/meta/recipes-devtools/python/python_2.7.17.bb
@@ -44,6 +44,9 @@ PACKAGECONFIG ??= "bdb"
 PACKAGECONFIG[bdb] = ",,db"
 PACKAGECONFIG[tk] = ",,tk"
 
+# pgen isn't needed in the current build, but use the binary from python-native just in case.
+EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen"
+
 do_configure_append() {
        rm -f ${S}/Makefile.orig
         autoreconf -Wcross --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi
@@ -82,7 +85,7 @@ do_compile() {
        export CROSS_COMPILE="${TARGET_PREFIX}"
        export PYTHONBUILDDIR="${B}"
 
-       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+       oe_runmake \
                HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
                STAGING_LIBDIR=${STAGING_LIBDIR} \
                STAGING_INCDIR=${STAGING_INCDIR} \
@@ -100,7 +103,7 @@ do_install() {
 
        # After swizzling the makefile, we need to run the build again.
        # install can race with the build so we have to run this first, then install
-       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+       oe_runmake \
                HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
                CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
                STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -108,7 +111,7 @@ do_install() {
                STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
                DESTDIR=${D} LIBDIR=${libdir}
        
-       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+       oe_runmake \
                HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
                CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
                STAGING_LIBDIR=${STAGING_LIBDIR} \