summaryrefslogtreecommitdiff
path: root/package/python2
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
commit9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
treeadb1937bc90be8869a5f7c9636da84773414eb3b /package/python2
parent52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage
Diffstat (limited to 'package/python2')
-rw-r--r--package/python2/Makefile2
-rw-r--r--package/python2/patches/patch-Makefile_pre267
-rw-r--r--package/python2/patches/patch-Makefile_pre_in11
3 files changed, 278 insertions, 2 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile
index dc9092dd9..60cb0c705 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS:= --with-threads \
post-extract:
$(CP) ./files/python-config.in ${WRKBUILD}/Misc/python-config.in
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- OPT="$(HOSTCFLAGS)" \
+ OPT="$(CFLAGS_FOR_BUILD)" \
./configure --without-cxx-main --without-threads \
--prefix=$(STAGING_HOST_DIR)/usr \
);
diff --git a/package/python2/patches/patch-Makefile_pre b/package/python2/patches/patch-Makefile_pre
new file mode 100644
index 000000000..e12bc29de
--- /dev/null
+++ b/package/python2/patches/patch-Makefile_pre
@@ -0,0 +1,267 @@
+--- Python-2.7.1.orig/Makefile.pre 2011-01-20 22:14:19.477398102 +0100
++++ Python-2.7.1/Makefile.pre 2011-01-20 22:11:27.957401058 +0100
+@@ -28,12 +28,12 @@ VERSION= 2.7
+ srcdir= .
+
+
+-CC= gcc
+-CXX= g++
++CC= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++CXX= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
+ MAINCC= $(CC)
+ LINKCC= $(PURIFY) $(MAINCC)
+-AR= ar
+-RANLIB= ranlib
++AR= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
++RANLIB= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib
+ SVNVERSION= svnversion $(srcdir)
+
+ GNULD= yes
+@@ -57,21 +57,21 @@ INSTALL_SHARED= ${INSTALL} -m 555
+ MAKESETUP= $(srcdir)/Modules/makesetup
+
+ # Compiler options
+-OPT= -DNDEBUG -O2 -Wall
++OPT= -DNDEBUG -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
+ BASECFLAGS= -fno-strict-aliasing
+-CFLAGS= $(BASECFLAGS) -g -O2 $(OPT) $(EXTRA_CFLAGS)
++CFLAGS= $(BASECFLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe $(OPT) $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+-CPPFLAGS= -I. -IInclude -I$(srcdir)/Include
+-LDFLAGS=
++CPPFLAGS= -I. -IInclude -I$(srcdir)/Include -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include
++LDFLAGS= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib
+ LDLAST=
+ SGI_ABI=
+ CCSHARED= -fPIC
+ LINKFORSHARED= -Xlinker -export-dynamic
+ ARFLAGS= rc
+ # Extra C flags added for building the interpreter object files.
+-CFLAGSFORSHARED=
++CFLAGSFORSHARED=$(CCSHARED)
+ # C flags used for building the interpreter object files
+ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+
+@@ -80,7 +80,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
+ MACHDEP= linux2
+
+ # Install prefix for architecture-independent files
+-prefix= /home/wbx/adk/openadk/host_i686_uclibc/usr
++prefix= /usr
+
+ # Install prefix for architecture-dependent files
+ exec_prefix= ${prefix}
+@@ -89,9 +89,9 @@ exec_prefix= ${prefix}
+ datarootdir= ${prefix}/share
+
+ # Expanded directories
+-BINDIR= ${exec_prefix}/bin
++BINDIR= /usr/bin
+ LIBDIR= ${exec_prefix}/lib
+-MANDIR= ${datarootdir}/man
++MANDIR= /usr/share/man
+ INCLUDEDIR= ${prefix}/include
+ CONFINCLUDEDIR= $(exec_prefix)/include
+ SCRIPTDIR= $(prefix)/lib
+@@ -130,7 +130,7 @@ MACOSX_DEPLOYMENT_TARGET=
+ OTHER_LIBTOOL_OPT=
+
+ # Environment to run shared python without installed libraries
+-RUNSHARED=
++RUNSHARED= LD_LIBRARY_PATH=/home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-python2-2.7.1-1/Python-2.7.1:
+
+ # Modes for directories, executables and data files created by the
+ # install process. Default to user-only-writable for all file types.
+@@ -139,7 +139,7 @@ EXEMODE= 755
+ FILEMODE= 644
+
+ # configure script arguments
+-CONFIG_ARGS= '--without-cxx-main' '--without-threads' '--prefix=/home/wbx/adk/openadk/host_i686_uclibc/usr'
++CONFIG_ARGS= '--build=x86_64-linux-gnu' '--host=i686-openadk-linux' '--target=i686-openadk-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--bindir=/usr/bin' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--with-threads' '--disable-toolbox-glue' '--with-system-ffi' '--without-cxx-main' 'build_alias=x86_64-linux-gnu' 'host_alias=i686-openadk-linux' 'target_alias=i686-openadk-linux' 'CC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc' 'CFLAGS=-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib' 'LIBS=' 'CPPFLAGS=-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include'
+
+
+ # Subdirectories with code
+@@ -156,20 +156,20 @@ DIST= $(DISTFILES) $(DISTDIRS)
+
+
+ LIBRARY= libpython$(VERSION).a
+-LDLIBRARY= libpython$(VERSION).a
+-BLDLIBRARY= $(LDLIBRARY)
++LDLIBRARY= libpython$(VERSION).so
++BLDLIBRARY= -L. -lpython$(VERSION)
+ DLLLIBRARY=
+ LDLIBRARYDIR=
+-INSTSONAME= $(LDLIBRARY)
++INSTSONAME= libpython$(VERSION).so.1.0
+
+
+-LIBS= -ldl -lutil
++LIBS= -lpthread -ldl -lpthread -lutil
+ LIBM= -lm
+ LIBC=
+ SYSLIBS= $(LIBM) $(LIBC)
+ SHLIBS= $(LIBS)
+
+-THREADOBJ=
++THREADOBJ= Python/thread.o
+ DLINCLDIR= .
+ DYNLOADFILE= dynload_shlib.o
+ MACHDEP_OBJS=
+@@ -179,6 +179,7 @@ UNICODE_OBJS= Objects/unicodeobject.o
+
+ 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
+@@ -206,11 +207,12 @@ GRAMMAR_C= $(srcdir)/Python/graminit.c
+ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
+
+
+-LIBFFI_INCLUDEDIR=
++LIBFFI_INCLUDEDIR= /home/wbx/adk/openadk/target_i686_uclibc/usr/include
+
+ ##########################################################################
+ # Parser
+ PGEN= Parser/pgen$(EXE)
++HOSTPGEN?= $(PGEN)$(EXE)
+
+ POBJS= \
+ Parser/acceler.o \
+@@ -380,7 +382,7 @@ build_all_generate_profile:
+ $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
+
+ run_profile_task:
+- ./$(BUILDPYTHON) $(PROFILE_TASK)
++ $(HOSTPYTHON) $(PROFILE_TASK)
+
+ build_all_use_profile:
+ $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
+@@ -398,14 +400,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) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig 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
+@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
+
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+ -@$(INSTALL) -d Include
+- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+
+ $(PGEN): $(PGENOBJS)
+ $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
+
+ TESTOPTS= -l $(EXTRATESTOPTS)
+ TESTPROG= $(srcdir)/Lib/test/regrtest.py
+-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
++TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
+ test: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
+@@ -725,7 +727,7 @@ testuniversal: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+ $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+- $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
++ $(RUNSHARED) /usr/libexec/oah/translate $(HOSTPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
+
+
+ # Like testall, but with a single pass only
+@@ -920,26 +922,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+ done; \
+ done
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ $(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 \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ $(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):
+@@ -1044,7 +1046,8 @@ libainstall: all python-config
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++ CROSS_COMPILE='$(CROSS_COMPILE)' \
++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --install-platlib=$(DESTSHARED) \
+@@ -1082,7 +1085,7 @@ frameworkinstallstructure: $(LDLIBRARY)
+ fi; \
+ done
+ $(LN) -fsn include/python$(VERSION) $(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
+@@ -1117,7 +1120,7 @@ frameworkinstallextras:
+ # This installs a few of the useful scripts in Tools/scripts
+ scriptsinstall:
+ SRCDIR=$(srcdir) $(RUNSHARED) \
+- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --root=/$(DESTDIR)
+@@ -1139,7 +1142,7 @@ config.status: $(srcdir)/configure
+
+ # 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
+@@ -1242,7 +1245,7 @@ funny:
+
+ # Perform some verification checks on any modified files.
+ patchcheck:
+- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
++ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+
+ # Dependencies
+
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index 5fec2d1a1..d3737ae3e 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,6 +1,15 @@
diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
--- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200
-+++ Python-2.7.1/Makefile.pre.in 2010-12-27 21:06:29.000000000 +0100
++++ Python-2.7.1/Makefile.pre.in 2011-01-20 22:13:22.464906869 +0100
+@@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese
+ # Compiler options
+ OPT= @OPT@
+ BASECFLAGS= @BASECFLAGS@
+-CFLAGS= $(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS)
++CFLAGS= $(BASECFLAGS) @CFLAGS@ $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
@@ -179,6 +179,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
PYTHON= python$(EXE)