[OE-core] [PATCH 2/4] python3: remove redundant patch
Khem Raj
raj.khem at gmail.com
Mon Sep 10 16:12:44 UTC 2018
On Mon, Sep 10, 2018 at 6:31 AM Ross Burton <ross.burton at intel.com> wrote:
>
> None of the Python invocations that this changes are actually called, and
> there's no need to provide a HOSTPGEN variable when the recipe can just override
> PGEN directly.
>
patch is also substituting ./$(BUILDPYTHON) with $(HOSTPYTHON), how is
that taken care of ?
maybe try to a build where hostarch != targetarch might catch the
problem. If its handled in other
ways then its probably good riddance.
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
> .../python/python3-native_3.5.5.bb | 1 -
> .../python3/0001-cross-compile-support.patch | 96 ----------------------
> meta/recipes-devtools/python/python3_3.5.5.bb | 3 +-
> 3 files changed, 1 insertion(+), 99 deletions(-)
> delete mode 100644 meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
>
> diff --git a/meta/recipes-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb
> index 3098027d803..7b940a16d28 100644
> --- a/meta/recipes-devtools/python/python3-native_3.5.5.bb
> +++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb
> @@ -7,7 +7,6 @@ DISTRO_SRC_URI_linuxstdbase = ""
> SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
> file://12-distutils-prefix-is-inside-staging-area.patch \
> file://python-config.patch \
> -file://0001-cross-compile-support.patch \
> file://030-fixup-include-dirs.patch \
> file://070-dont-clean-ipkg-install.patch \
> file://080-distutils-dont_adjust_files.patch \
> diff --git a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch b/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
> deleted file mode 100644
> index 7cd7e3b4906..00000000000
> --- a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -From ecde3ea170999a9ef734e8af4d7c25be5ba81697 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin at gmail.com>
> -Date: Fri, 31 Mar 2017 15:42:46 +0300
> -Subject: [PATCH] cross-compile support
> -
> -We cross compile python. This patch uses tools from host/native
> -python instead of in-tree tools
> -
> --Khem
> -
> -Rebased on 3.5.4
> -
> -Upstream-Status: Inappropriate[Configuration Specific]
> -Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> -Signed-off-by: Derek Straka <derek at asterius.io>
> ----
> - Makefile.pre.in | 14 ++++++++------
> - 1 file changed, 8 insertions(+), 6 deletions(-)
> -
> -diff --git a/Makefile.pre.in b/Makefile.pre.in
> -index 144c1f8629..f252ac2417 100644
> ---- a/Makefile.pre.in
> -+++ b/Makefile.pre.in
> -@@ -223,6 +223,7 @@ LIBOBJS= @LIBOBJS@
> -
> - PYTHON= python$(EXE)
> - BUILDPYTHON= python$(BUILDEXE)
> -+HOSTPYTHON= $(BUILDPYTHON)
> -
> - PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@
> - PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
> -@@ -277,6 +278,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
> - ##########################################################################
> - # Parser
> - PGEN= Parser/pgen$(EXE)
> -+HOSTPGEN= $(PGEN)$(EXE)
> -
> - PSRCS= \
> - Parser/acceler.c \
> -@@ -478,7 +480,7 @@ build_all_generate_profile:
> -
> - run_profile_task:
> - : # FIXME: can't run for a cross build
> -- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
> -+ $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true
> -
> - build_all_merge_profile:
> - $(LLVM_PROF_MERGER)
> -@@ -772,7 +774,7 @@ regen-grammar: $(PGEN)
> - # 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
> -
> -@@ -978,7 +980,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)
> - ######################################################################
> -
> - TESTOPTS= $(EXTRATESTOPTS)
> --TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
> -+TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS)
> - TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
> - TESTTIMEOUT= 3600
> -
> -@@ -1470,7 +1472,7 @@ frameworkinstallstructure: $(LDLIBRARY)
> - fi; \
> - done
> - $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
> -- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
> -+ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
> - $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
> - $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
> - $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
> -@@ -1543,7 +1545,7 @@ Python/dtoa.o: Python/dtoa.c
> -
> - # Run reindent on the library
> - reindent:
> -- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
> -+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
> -
> - # Rerun configure with the same options as it was run last time,
> - # provided the config.status script exists
> -@@ -1678,7 +1680,7 @@ funny:
> -
> - # Perform some verification checks on any modified files.
> - patchcheck: @DEF_MAKE_RULE@
> -- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
> -+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
> -
> - # Dependencies
> -
> ---
> -2.11.0
> -
> diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb
> index 93878e4e45c..6598b486afe 100644
> --- a/meta/recipes-devtools/python/python3_3.5.5.bb
> +++ b/meta/recipes-devtools/python/python3_3.5.5.bb
> @@ -11,7 +11,6 @@ DISTRO_SRC_URI ?= "file://sitecustomize.py"
> DISTRO_SRC_URI_linuxstdbase = ""
> SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
> file://python-config.patch \
> -file://0001-cross-compile-support.patch \
> file://030-fixup-include-dirs.patch \
> file://070-dont-clean-ipkg-install.patch \
> file://080-distutils-dont_adjust_files.patch \
> @@ -101,7 +100,7 @@ do_configure_append() {
> }
>
> run_make() {
> - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \
> + oe_runmake PGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \
> HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \
> STAGING_LIBDIR=${STAGING_LIBDIR} \
> STAGING_INCDIR=${STAGING_INCDIR} \
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
More information about the Openembedded-core
mailing list