summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2018-08-07 17:51:35 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2018-08-07 17:51:35 +0200
commit986f531a90bd9823cce58e90f6ee4533111a0515 (patch)
tree1f9a268be1d91259496f2ec8d358f78afde58d32
parent6c97700f6d68a3b9e46525e676ecbd59ee7b3039 (diff)
downloadnet-986f531a90bd9823cce58e90f6ee4533111a0515.tar.gz
net-986f531a90bd9823cce58e90f6ee4533111a0515.tar.xz
mod_wsgi: version bump to 4.6.4
-rw-r--r--packages/apache-mod/mod_wsgi/mod_wsgi-4.6.4.exheres-0 (renamed from packages/apache-mod/mod_wsgi/mod_wsgi-4.5.15.exheres-0)0
-rw-r--r--packages/apache-mod/mod_wsgi/mod_wsgi.exlib12
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/apache-mod/mod_wsgi/mod_wsgi-4.5.15.exheres-0 b/packages/apache-mod/mod_wsgi/mod_wsgi-4.6.4.exheres-0
index 0fd75b3..0fd75b3 100644
--- a/packages/apache-mod/mod_wsgi/mod_wsgi-4.5.15.exheres-0
+++ b/packages/apache-mod/mod_wsgi/mod_wsgi-4.6.4.exheres-0
diff --git a/packages/apache-mod/mod_wsgi/mod_wsgi.exlib b/packages/apache-mod/mod_wsgi/mod_wsgi.exlib
index e6c211b..bde4df5 100644
--- a/packages/apache-mod/mod_wsgi/mod_wsgi.exlib
+++ b/packages/apache-mod/mod_wsgi/mod_wsgi.exlib
@@ -2,7 +2,8 @@
# Copyright 2012-2017 Wulf C. Krueger <philantrop@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=GrahamDumpleton tag=${PV} ] setup-py [ import=setuptools blacklist=none has_bin=true min_versions='2.3' ]
+require github [ user=GrahamDumpleton tag=${PV} ] \
+ setup-py [ import=setuptools has_bin=true ]
export_exlib_phases src_install
@@ -24,10 +25,9 @@ DEPENDENCIES="
www-servers/apache[>=2.4][apache_modules:status][apache_modules:version]
"
-#BUGS_TO="philantrop@exherbo.org"
-
install_one_multibuild() {
local py_ver py_abi_short
+ local host=$(exhost --target)
setup-py_install_one_multibuild
@@ -39,7 +39,7 @@ install_one_multibuild() {
if [[ ${py_ver} == 2 ]]; then
dosym $(python_get_sitedir)/${PN}/server/${PN}-py${py_abi_short}.so /usr/$(exhost --target)/libexec/apache2/modules/mod_wsgi.so
elif [[ ${py_ver} == 3 ]]; then
- dosym $(python_get_sitedir)/${PN}/server/${PN}-py${py_abi_short}.cpython-${py_abi_short}m.so /usr/$(exhost --target)/libexec/apache2/modules/mod_wsgi.so
+ dosym $(python_get_sitedir)/${PN}/server/${PN}-py${py_abi_short}.cpython-${py_abi_short}m-${host/-pc}.so /usr/$(exhost --target)/libexec/apache2/modules/mod_wsgi.so
fi
fi
}
@@ -49,7 +49,11 @@ mod_wsgi_src_install() {
insinto /etc/apache2/modules.d
hereins 70_${PN}.conf <<EOF
+<IfDefine WSGI>
LoadModule wsgi_module libexec/apache2/modules/mod_wsgi.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
EOF
}