jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-25 19:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python: dont build and use Parser/pgen and simplifing crosscompile patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2016-03-06 15:43:27 +01:00
parent 12ae64a12f
commit a6179a798a
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/lang/Python/package.mk
View File

@ -64,6 +64,13 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file_dev_ptc=no \
--without-cxx-main \ --without-cxx-main \
--with-system-ffi \ --with-system-ffi \
--with-system-expat" --with-system-expat"
post_patch() {
# This is needed to make sure the Python build process doesn't try to
# regenerate those files with the pgen program. Otherwise, it builds
# pgen for the target, and tries to run it on the host.
touch $PKG_BUILD/Include/graminit.h
touch $PKG_BUILD/Python/graminit.c
}
make_host() { make_host() {
make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \ make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
@ -82,8 +89,6 @@ makeinstall_host() {
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
install install
cp Parser/pgen $ROOT/$TOOLCHAIN/bin
# replace python-config to make sure python uses $SYSROOT_PREFIX # replace python-config to make sure python uses $SYSROOT_PREFIX
mkdir -p $ROOT/$TOOLCHAIN/bin mkdir -p $ROOT/$TOOLCHAIN/bin
rm -rf $ROOT/$TOOLCHAIN/bin/python*-config rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
@ -102,7 +107,6 @@ pre_configure_target() {
make_target() { make_target() {
make -j1 CC="$TARGET_CC" \ make -j1 CC="$TARGET_CC" \
HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
PYTHON_MODULES_LIB="$TARGET_LIBDIR" PYTHON_MODULES_LIB="$TARGET_LIBDIR"
@ -111,7 +115,6 @@ make_target() {
makeinstall_target() { makeinstall_target() {
make -j1 CC="$TARGET_CC" \ make -j1 CC="$TARGET_CC" \
DESTDIR=$SYSROOT_PREFIX \ DESTDIR=$SYSROOT_PREFIX \
HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
PYTHON_MODULES_LIB="$TARGET_LIBDIR" \ PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
@ -123,7 +126,6 @@ makeinstall_target() {
make -j1 CC="$TARGET_CC" \ make -j1 CC="$TARGET_CC" \
DESTDIR=$INSTALL \ DESTDIR=$INSTALL \
HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
PYTHON_MODULES_LIB="$TARGET_LIBDIR" \ PYTHON_MODULES_LIB="$TARGET_LIBDIR" \

17
packages/lang/Python/patches/Python-2.7.11-001_xcompile.patch
View File

@ -10,14 +10,6 @@ index bcd83bf..5e54a0d 100644
PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
_PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
@@ -231,6 +232,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
+HOSTPGEN= $(PGEN)
PSRCS= \
Parser/acceler.c \
@@ -461,6 +463,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt @@ -461,6 +463,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt
esac; \ esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
@ -26,15 +18,6 @@ index bcd83bf..5e54a0d 100644
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library # Build static library
@@ -598,7 +601,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
$(MAKE) $(PGEN)
- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
$(MAKE) $(GRAMMAR_H)
touch $(GRAMMAR_C)
@@ -1142,7 +1145,9 @@ libainstall: all python-config @@ -1142,7 +1145,9 @@ libainstall: all python-config
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)