fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-31 14:51:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:/antirez/redis into unstable

Browse Source
This commit is contained in:
antirez 2015-02-14 17:19:37 +01:00
commit cfe5eaaed6
1 changed files with 13 additions and 10 deletions

23
README.md

@ -29,7 +29,7 @@ and 64 bit systems.
It may compile on Solaris derived systems (for instance SmartOS) but our It may compile on Solaris derived systems (for instance SmartOS) but our
support for this platform is *best effort* and Redis is not guaranteed to support for this platform is *best effort* and Redis is not guaranteed to
work as well as in Linux, OSX, and `*`BSD there. work as well as in Linux, OSX, and \*BSD there.
It is as simple as: It is as simple as:
@ -44,7 +44,8 @@ After building Redis is a good idea to test it, using:
% make test % make test
Fixing build problems with dependencies or cached build options Fixing build problems with dependencies or cached build options
—-------- ---------
Redis has some dependencies which are included into the `deps` directory. Redis has some dependencies which are included into the `deps` directory.
`make` does not rebuild dependencies automatically, even if something in the `make` does not rebuild dependencies automatically, even if something in the
source code of dependencies is changes. source code of dependencies is changes.
@ -59,7 +60,7 @@ This will clean: jemalloc, lua, hiredis, linenoise.
Also if you force certain build options like 32bit target, no C compiler Also if you force certain build options like 32bit target, no C compiler
optimizations (for debugging purposes), and other similar build time options, optimizations (for debugging purposes), and other similar build time options,
those options are cached indefinitely until you issue a "make distclean" those options are cached indefinitely until you issue a `make distclean`
command. command.
Fixing problems building 32 bit binaries Fixing problems building 32 bit binaries
@ -67,15 +68,14 @@ Fixing problems building 32 bit binaries
If after building Redis with a 32 bit target you need to rebuild it If after building Redis with a 32 bit target you need to rebuild it
with a 64 bit target, or the other way around, you need to perform a with a 64 bit target, or the other way around, you need to perform a
"make distclean" in the root directory of the Redis distribution. `make distclean` in the root directory of the Redis distribution.
In case of build errors when trying to build a 32 bit binary of Redis, try In case of build errors when trying to build a 32 bit binary of Redis, try
the following steps: the following steps:
* Install the packages libc6-dev-i386 (also try g++-multilib). * Install the packages libc6-dev-i386 (also try g++-multilib).
* Try using the following command line instead of "make 32bit": * Try using the following command line instead of `make 32bit`:
`make CFLAGS="-m32 -march=native" LDFLAGS="-m32"`
make CFLAGS="-m32 -march=native" LDFLAGS="-m32"
Allocator Allocator
--------- ---------
@ -143,7 +143,7 @@ then in another terminal try the following:
(integer) 1 (integer) 1
redis> incr mycounter redis> incr mycounter
(integer) 2 (integer) 2
redis> redis>
You can find the list of all the available commands at http://redis.io/commands. You can find the list of all the available commands at http://redis.io/commands.
@ -179,10 +179,13 @@ Code contributions
Note: by contributing code to the Redis project in any form, including sending Note: by contributing code to the Redis project in any form, including sending
a pull request via Github, a code fragment or patch via private email or a pull request via Github, a code fragment or patch via private email or
public discussion groups, you agree to release your code under the terms public discussion groups, you agree to release your code under the terms
of the BSD license that you can find in the COPYING file included in the Redis of the BSD license that you can find in the [COPYING][1] file included in the Redis
source distribution. source distribution.
Please see the CONTRIBUTING file in this source distribution for more Please see the [CONTRIBUTING][2] file in this source distribution for more
information. information.
Enjoy! Enjoy!
[1]: https://github.com/antirez/redis/blob/unstable/COPYING
[2]: https://github.com/antirez/redis/blob/unstable/CONTRIBUTING