diff options
| author | Alexander Dahl <ada@thorsis.com> | 2017-08-28 20:08:16 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-09-04 15:04:12 +0200 |
| commit | 10472115070ba41d2488eede660dabe4393d0541 (patch) | |
| tree | e17c2abcf1be0c9dabbe4da7d18a750c2b21ccc6 /rules | |
| parent | ba3fed8a3f39746b1a2294fe19ec1d0d36255047 (diff) | |
| download | ptxdist-10472115070ba41d2488eede660dabe4393d0541.tar.gz ptxdist-10472115070ba41d2488eede660dabe4393d0541.tar.xz | |
lighttpd: Rename memcache option to memcached
The memcached ./configure option for lighttpd changed, see the changeset
for upgrading lighttpd package from 1.4.39 to 1.4.45. For making the
configure option consistent with the menu entry, the menu variable is
renamed here. It seems lighttpd has switched from libmemcache to
libmemcached for memcached support.
Took this from a not applied patch from 2016, and added the necessary
migration helper suggested by Michael Olbrich, plus the dependency
changes in lighttpd.in.
However libmemcache and libmemcached are outdated and build against the
old libmemcached fails now, so mark it as broken.
Suggested-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
Suggested-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
[mol: LIGHTTPD_MOD_TRIGGER_B4_DL is also broken + commends for that]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/lighttpd.in | 10 | ||||
| -rw-r--r-- | rules/lighttpd.make | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/rules/lighttpd.in b/rules/lighttpd.in index d53539408..3e7e0ed69 100644 --- a/rules/lighttpd.in +++ b/rules/lighttpd.in @@ -16,7 +16,7 @@ menuconfig LIGHTTPD select SQLITE if LIGHTTPD_WEBDAV_PROPS select LIBUUID if LIGHTTPD_WEBDAV_LOCKS select OPENSSL if LIGHTTPD_OPENSSL - select LIBMEMCACHE if LIGHTTPD_MEMCACHE + select LIBMEMCACHED if LIGHTTPD_MEMCACHED select LUA if LIGHTTPD_LUA select LUA_INSTALL_LIBLUA if LIGHTTPD_LUA select PHP5 if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME @@ -60,9 +60,11 @@ config LIGHTTPD_LUA help lua engine for mod_cml and mod_magnet -config LIGHTTPD_MEMCACHE +config LIGHTTPD_MEMCACHED bool prompt "memcached storage" + # fails to build with current libmemcached version + depends on BROKEN help memcached storage for mod_trigger_b4_dl and mod_cml @@ -171,8 +173,10 @@ config LIGHTTPD_MOD_REWRITE config LIGHTTPD_MOD_TRIGGER_B4_DL bool - select LIGHTTPD_MEMCACHE + select LIGHTTPD_MEMCACHED select LIGHTTPD_PCRE + # needs (currently broken) LIGHTTPD_MEMCACHED + depends on BROKEN prompt "mod_trigger_b4_dl" help Module for Anti Hotlinking diff --git a/rules/lighttpd.make b/rules/lighttpd.make index fd6e1cf84..8b522670a 100644 --- a/rules/lighttpd.make +++ b/rules/lighttpd.make @@ -60,7 +60,7 @@ LIGHTTPD_CONF_OPT := \ --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \ --without-gdbm \ --without-geoip \ - --$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcached \ + --$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHED)-memcached \ --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua # ---------------------------------------------------------------------------- |