public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_python: Update to 3.5.0

Browse Source 
This fixes building against Apache 2.4.
This commit is contained in:
Eelco Dolstra
2014-11-07 11:30:44 +01:00
parent fbbd88017f
commit bad2955079
2 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/servers/http/apache-modules/mod_python/install.patch
View File

@@ -1,20 +1,12 @@
diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in
*** mod_python-3.1.4-orig/dist/Makefile.in 2005-01-29 22:25:28.000000000 +0100
--- mod_python-3.1.4/dist/Makefile.in 2006-01-15 12:07:40.000000000 +0100
***************
*** 34,40 ****
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 ; \
else \
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
fi
--- 34,40 ----
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 --prefix $(out) ; \
else \
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
fi
diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in
--- mod_python-3.5.0-orig/dist/Makefile.in 2013-11-12 04:21:34.000000000 +0100
+++ mod_python-3.5.0/dist/Makefile.in 2014-11-07 11:28:24.466377733 +0100
@@ -34,7 +34,7 @@
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 $(out) ; \
else \
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
fi