summaryrefslogtreecommitdiff
path: root/deps/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* [In-Progress] Add Geo CommandsMatt Stancliff2015-06-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Current todo: - replace functions in zset.{c,h} with a new unified Redis zset access API. Once we get the zset interface fixed, we can squash relevant commits in this branch and have one nice commit to merge into unstable. This commit adds: - Geo commands - Tests; runnable with: ./runtest --single unit/geo - Geo helpers in deps/geohash-int/ - src/geo.{c,h} and src/geojson.{c,h} implementing geo commands - Updated build configurations to get everything working - TEMPORARY: src/zset.{c,h} implementing zset score and zset range reading without writing to client output buffers. - Modified linkage of one t_zset.c function for use in zset.c Conflicts: src/Makefile src/redis.c
* Set optional 'static' for Quicklist+RedisMatt Stancliff2015-01-021-1/+1
| | | | | This also defines REDIS_STATIC='' for building everything inside src/ and everything inside deps/lua/.
* Lua: Upgrade cjson to 2.1.0 (2012-03-01)Matt Stancliff2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | The new cjson has some improvements over our current version including increased platform compatability, a new resource limit to restrict decode depth, and better invalid number handling. One minor change was required to deps/Makefile because this version of cjson doesn't export itself globally, so we added a quick little define of -DENABLE_CJSON_GLOBAL. cjson now has an optional higher performing float parsing interface, but we are not including it (g_fmt.c, dtoa.c) because it requires endianness declaration during compile time. This commit is exactly lua_cjson.c from 2.1.0 with one minor change of altering the two Lua includes for local search instead of system-wide importing.
* Define AR to help with lua cross-compilationDaniel Price2014-08-121-1/+6
| | | | Closes #997
* Spaces to tabsJohan Bergström2013-03-161-2/+2
|
* 32 bit build fixed on Linux.antirez2012-11-011-1/+1
| | | | | | | | It failed because of the way jemalloc was compiled (without passing the right flags to make, but just to configure). Now the same set of flags are also passed to the make command, fixing the issue. This fixes issue #744
* Clean up MakefilesPieter Noordhuis2012-04-111-33/+52
| | | | | | | Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
* Rebuild deps/ and src/ when ARCH changesPieter Noordhuis2011-11-151-0/+59
This change moves the build instructions for dependencies to a separate Makefile in deps/. The ARCH environment variable is stored in a .make-arch file in the same directory as the Makefile. The contents of this file is read and compared to the current ARCH, and, on a mismatch triggers rebuilding the entire source tree. When file .make-arch exists and matches with ARCH from the environment, the dependencies are assumed to already be built. The new "clean" target only cleans the Redis source tree, not its dependencies. To clear the dependencies as well, the "distclean" target can be used.