From ffad46176137e3e914d8953f725d0a0ce2c4091b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 5 May 2009 17:34:00 +0000 Subject: [mod_python] adopted to new python version Signed-off-by: Marc Kleine-Budde git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10369 33e552b5-05e3-0310-8538-816dae2090ed --- .../generic/fix-python-module-installation.diff | 24 +++++++++++++++++++ patches/mod_python-3.3.1/generic/series | 1 + rules/apache2_mod_python.in | 3 +-- rules/apache2_mod_python.make | 28 ++++++++-------------- 4 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 patches/mod_python-3.3.1/generic/fix-python-module-installation.diff diff --git a/patches/mod_python-3.3.1/generic/fix-python-module-installation.diff b/patches/mod_python-3.3.1/generic/fix-python-module-installation.diff new file mode 100644 index 000000000..1d602cd42 --- /dev/null +++ b/patches/mod_python-3.3.1/generic/fix-python-module-installation.diff @@ -0,0 +1,24 @@ +Subject: install python modules into prefix +From: Marc Kleine-Budde + +Signed-off-by: Marc Kleine-Budde +--- + dist/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: mod_python-3.3.1/dist/Makefile.in +=================================================================== +--- mod_python-3.3.1.orig/dist/Makefile.in ++++ mod_python-3.3.1/dist/Makefile.in +@@ -34,9 +34,9 @@ install: install_py_lib + install_py_lib: mod_python src + @cd src; $(MAKE) psp_parser.c + if test -z "$(DESTDIR)" ; then \ +- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ ++ $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix=@prefix@ ; \ + else \ +- $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ ++ $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix=@prefix@ --root $(DESTDIR) ; \ + fi + + mod_python.so: diff --git a/patches/mod_python-3.3.1/generic/series b/patches/mod_python-3.3.1/generic/series index d211fda4b..6fd402194 100644 --- a/patches/mod_python-3.3.1/generic/series +++ b/patches/mod_python-3.3.1/generic/series @@ -1,3 +1,4 @@ configure.in-apache-version.diff +fix-python-module-installation.diff mod_python-3.3.1-python-headers.diff mod_python-3.3.1-autogen.diff diff --git a/rules/apache2_mod_python.in b/rules/apache2_mod_python.in index 452844277..05881bc55 100644 --- a/rules/apache2_mod_python.in +++ b/rules/apache2_mod_python.in @@ -4,8 +4,7 @@ config APACHE2_MOD_PYTHON tristate prompt "apache2 mod_python" select APACHE2 - select HOST_APACHE2 - select PYTHON24 + select PYTHON help This module adds the python script language to the server to support dynamic website generation diff --git a/rules/apache2_mod_python.make b/rules/apache2_mod_python.make index 0f0cc59eb..2ee57a593 100644 --- a/rules/apache2_mod_python.make +++ b/rules/apache2_mod_python.make @@ -2,6 +2,7 @@ # $Id: template 2922 2005-07-11 19:17:53Z rsc $ # # Copyright (C) 2005 by Robert Schwebel +# 2009 by Marc Kleine-Budde # # See CREDITS for details about who has contributed to this project. # @@ -23,6 +24,7 @@ APACHE2_MOD_PYTHON_SUFFIX := tgz APACHE2_MOD_PYTHON_URL := http://apache.easy-webs.de/httpd/modpython/$(APACHE2_MOD_PYTHON).$(APACHE2_MOD_PYTHON_SUFFIX) APACHE2_MOD_PYTHON_SOURCE := $(SRCDIR)/$(APACHE2_MOD_PYTHON).$(APACHE2_MOD_PYTHON_SUFFIX) APACHE2_MOD_PYTHON_DIR := $(BUILDDIR)/$(APACHE2_MOD_PYTHON) +APACHE2_MOD_PYTHON_PKGDIR := $(PKGDIR)/$(APACHE2_MOD_PYTHON) # ---------------------------------------------------------------------------- # Get @@ -45,16 +47,7 @@ APACHE2_MOD_PYTHON_ENV := $(CROSS_ENV) APACHE2_MOD_PYTHON_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --with-apxs=$(SYSROOT)/usr/bin/apxs \ - --with-python=$(PTXCONF_SYSROOT_HOST)/bin/python \ - --with-python-includes=$(SYSROOT)/usr - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/apache2_mod_python.install: - @$(call targetinfo) - @$(call touch) + --with-python=$(PTXCONF_SYSROOT_CROSS)/bin/python # ---------------------------------------------------------------------------- # Target-Install @@ -68,20 +61,19 @@ $(STATEDIR)/apache2_mod_python.targetinstall: @$(call install_fixup, apache2_mod_python,PRIORITY,optional) @$(call install_fixup, apache2_mod_python,VERSION,$(APACHE2_MOD_PYTHON_VERSION)) @$(call install_fixup, apache2_mod_python,SECTION,base) - @$(call install_fixup, apache2_mod_python,AUTHOR,"Robert Schwebel ") + @$(call install_fixup, apache2_mod_python,AUTHOR,"Robert Schwebel ") @$(call install_fixup, apache2_mod_python,DEPENDS,) @$(call install_fixup, apache2_mod_python,DESCRIPTION,missing) @$(call install_copy, apache2_mod_python, 0, 0, 0644, \ - $(APACHE2_MOD_PYTHON_DIR)/src/.libs/mod_python.so, \ + $(APACHE2_MOD_PYTHON_PKGDIR)/mod_python.so, \ /usr/share/apache2/libexec/mod_python.so) - @$(call install_copy, apache2_mod_python, 0, 0, 0755, \ - /usr/lib/python2.4/mod_python) - - cd $(APACHE2_MOD_PYTHON_DIR)/lib/python/mod_python && \ - for i in *; do \ - $(call install_copy, apache2_mod_python, 0, 0, 0644, $$i, /usr/lib/python2.4/mod_python/$$i,n); \ + @cd $(APACHE2_MOD_PYTHON_PKGDIR) && \ + find ./usr/lib/python$(PYTHON_MAJORMINOR) \ + -name "*.so" -o -name "*.pyc" | \ + while read file; do \ + $(call install_copy, apache2_mod_python, 0, 0, 644, -, $${file##.}); \ done @$(call install_finish, apache2_mod_python) -- cgit v1.2.3