Merge branch 'master' into el6
This commit is contained in:
commit
af41e47aa9
@ -133,7 +133,7 @@ sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf
|
|||||||
%else
|
%else
|
||||||
%global malloc_flags MALLOC=jemalloc
|
%global malloc_flags MALLOC=jemalloc
|
||||||
%endif
|
%endif
|
||||||
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" %{malloc_flags} LUA_LDFLAGS+="%{?__global_ldflags}" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" %{malloc_flags} INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} %{make_flags} all
|
make %{?_smp_mflags} %{make_flags} all
|
||||||
|
Loading…
Reference in New Issue
Block a user