[meta-virtualization] [RFC][PATCH 01/16] Removed meta-virtualization private patch, and using upstream instead
David Nyström
david.nystrom at enea.com
Thu Dec 20 03:53:25 PST 2012
On 12/18/2012 03:43 PM, Bruce Ashfield wrote:
> Can you clarify "upstream" in the long log of this patch ? It may not be
> obvious to all readers which upstream you are referencing, oe-core, yocto,
> python, etc.
>
> Cheers,
>
> Bruce
Yes, will do, in this case I meant poky master.
>
>
> On Tue, Dec 18, 2012 at 9:31 AM, David Nyström <david.c.nystrom at gmail.com
> <mailto:david.c.nystrom at gmail.com>> wrote:
>
> Signed-off-by: David Nyström <david.nystrom at enea.com
> <mailto:david.nystrom at enea.com>>
> ---
> .../01-use-proper-tools-for-cross-build.patch | 138 --------------------
> recipes-devtools/python/python_2.7.3.bbappend | 9 --
> 2 files changed, 147 deletions(-)
> delete mode 100644
> recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
> delete mode 100644 recipes-devtools/python/python_2.7.3.bbappend
>
> diff --git
> a/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
> b/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
> deleted file mode 100644
> index 2589bde..0000000
> --- a/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
> +++ /dev/null
> @@ -1,138 +0,0 @@
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -# We need to ensure our host tools get run during build, not the freshly
> -# built cross-tools (this will not work), so we introduce HOSTPYTHON and
> HOSTPGEN.
> -# Signed-Off: Michael 'Mickey' Lauer <mickey at vanille-media.de
> <mailto:mickey at vanille-media.de>>
> -
> -Index: Python-2.7.2/Makefile.pre.in <http://Makefile.pre.in>
> -===================================================================
> ---- Python-2.7.2.orig/Makefile.pre.in <http://Makefile.pre.in>
> -+++ Python-2.7.2/Makefile.pre.in <http://Makefile.pre.in>
> -@@ -182,6 +182,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
> -
> - PYTHON= python$(EXE)
> - BUILDPYTHON= python$(BUILDEXE)
> -+HOSTPYTHON= $(BUILDPYTHON)
> -
> - # The task to run while instrument when building the profile-opt target
> - PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc
> --with-syscheck
> -@@ -214,7 +215,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
> - ##########################################################################
> - # Parser
> - PGEN= Parser/pgen$(EXE)
> --
> -+HOSTPGEN= $(PGEN)$(EXE)
> - POBJS= \
> - Parser/acceler.o \
> - Parser/grammar1.o \
> -@@ -401,14 +402,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
> - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
> -
> - platform: $(BUILDPYTHON)
> -- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig
> import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
> -+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from
> distutils.util import get_platform ; print
> get_platform()+"-"+sys.version[0:3]' >platform
> -
> -
> - # Build the shared modules
> - sharedmods: $(BUILDPYTHON)
> - @case $$MAKEFLAGS in \
> -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)'
> ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
> -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)'
> ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
> -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)'
> $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
> -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)'
> $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
> - esac
> -
> - # Build static library
> -@@ -542,7 +543,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
> - $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
> - Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
> - -@$(INSTALL) -d Include
> -- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
> -+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
> - -touch Parser/pgen.stamp
> -
> - $(PGEN): $(PGENOBJS)
> -@@ -926,25 +927,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
> - done
> - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
> - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
> -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
> -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
> - -d $(LIBDEST) -f \
> - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
> - $(DESTDIR)$(LIBDEST)
> - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
> -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
> -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
> - -d $(LIBDEST) -f \
> - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
> - $(DESTDIR)$(LIBDEST)
> - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
> -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
> -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
> - -d $(LIBDEST)/site-packages -f \
> - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
> - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
> -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
> -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
> - -d $(LIBDEST)/site-packages -f \
> - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
> - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
> -- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram,
> lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
> -+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram,
> lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
> -
> - # Create the PLATDIR source directory, if one wasn't distributed..
> - $(srcdir)/Lib/$(PLATDIR):
> -@@ -1049,7 +1050,7 @@ libainstall: all python-config
> - # Install the dynamically loadable modules
> - # This goes into $(exec_prefix)
> - sharedinstall: sharedmods
> -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
> -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
> - --prefix=$(prefix) \
> - --install-scripts=$(BINDIR) \
> - --install-platlib=$(DESTSHARED) \
> -Index: Python-2.7.2/setup.py
> -===================================================================
> ---- Python-2.7.2.orig/setup.py
> -+++ Python-2.7.2/setup.py
> -@@ -313,6 +313,7 @@ class PyBuildExt(build_ext):
> - self.failed.append(ext.name <http://ext.name>)
> - self.announce('*** WARNING: renaming "%s" since importing it'
> - ' failed: %s' % (ext.name <http://ext.name>,
> why), level=3)
> -+ return
> - assert not self.inplace
> - basename, tail = os.path.splitext(ext_filename)
> - newname = basename + "_failed" + tail
> -@@ -369,8 +370,8 @@ class PyBuildExt(build_ext):
> -
> - def detect_modules(self):
> - # Ensure that /usr/local is always used
> -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
> -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
> -+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
> -+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
> - self.add_multiarch_paths()
> -
> - # Add paths specified in the environment variables LDFLAGS and
> -@@ -475,6 +476,9 @@ class PyBuildExt(build_ext):
> -
> - # XXX Omitted modules: gl, pure, dl, SGI-specific modules
> -
> -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
> -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
> -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
> - #
> - # The following modules are all pretty straightforward, and compile
> - # on pretty much any POSIXish platform.
> -@@ -677,8 +681,8 @@ class PyBuildExt(build_ext):
> - elif curses_library:
> - readline_libs.append(curses_library)
> - elif self.compiler.find_library_file(lib_dirs +
> -- ['/usr/lib/termcap'],
> -- 'termcap'):
> -+ ['/usr/lib/termcap'],
> -+ 'termcap'):
> - readline_libs.append('termcap')
> - exts.append( Extension('readline', ['readline.c'],
> - library_dirs=['/usr/lib/termcap'],
> diff --git a/recipes-devtools/python/python_2.7.3.bbappend
> b/recipes-devtools/python/python_2.7.3.bbappend
> deleted file mode 100644
> index e39deba..0000000
> --- a/recipes-devtools/python/python_2.7.3.bbappend
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
> -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
> -
> -DEPENDS += " ncurses"
> -
> -do_compile_prepend() {
> - export LIBRARY_PATH=${STAGING_DIR_TARGET}/lib
> -}
> -
> --
> 1.7.9.5
>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its
> end"
>
More information about the meta-virtualization
mailing list