diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-12-01 15:41:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-12-01 15:41:25 +0100 |
| commit | eadbd60e3c14938645248266625916925d11dc06 (patch) | |
| tree | e2b13a1b83f4066e892a21595b3f928a01113f57 /package | |
| parent | ac500eeba1b526248d8212931e7391fb16b1c343 (diff) | |
| parent | 52a49601ba47b77d93d4856f2ee01e55755905f1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/php/files/php.ini | 2 | ||||
| -rw-r--r-- | package/python2/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/php/files/php.ini b/package/php/files/php.ini index 3a5172b3c..3858e4a8b 100644 --- a/package/php/files/php.ini +++ b/package/php/files/php.ini @@ -247,7 +247,7 @@ default_mimetype = "text/html" ; see documentation for security issues. The alternate is to use the ; cgi.force_redirect configuration below ; lighttpd: must be the same as server.document-root -doc_root = /srv/www/htdocs +;doc_root = /srv/www/htdocs ; The directory under which PHP opens the script using /~username used only ; if nonempty. diff --git a/package/python2/Makefile b/package/python2/Makefile index 36bcdf7fc..47033dc2a 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.5 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -97,7 +97,7 @@ CONFIGURE_ARGS:= --with-threads \ HOST_STYLE:= auto HOST_CONFIGURE_ARGS:= --with-threads \ - --enable-shared \ + --disable-shared \ --disable-toolbox-glue \ --without-cxx-main |