slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

32bit build fixed, broken by a previous commit fixing build on Solaris

Browse Source
This commit is contained in:
antirez 2011-11-08 21:00:52 +01:00
parent aa9a61ccd7
commit b28d0461b4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/lua/Makefile vendored
View File

@ -53,7 +53,7 @@ R= 5.1.4
all: $(PLAT) all: $(PLAT)
$(PLATS) clean: $(PLATS) clean:
cd src && $(MAKE) ARCH="$(ARCH)" $@ cd src && $(MAKE) $@
test: dummy test: dummy
src/lua test/hello.lua src/lua test/hello.lua

8
deps/lua/src/Makefile vendored
View File

@ -8,7 +8,7 @@
PLAT= none PLAT= none
CC= gcc CC= gcc
CFLAGS= -O2 -Wall $(MYCFLAGS) $(ARCH) CFLAGS= -O2 -Wall $(MYCFLAGS)
AR= ar rcu AR= ar rcu
RANLIB= ranlib RANLIB= ranlib
RM= rm -f RM= rm -f
@ -52,10 +52,10 @@ $(LUA_A): $(CORE_O) $(LIB_O)
$(RANLIB) $@ $(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A) $(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) $(ARCH) $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
$(LUAC_T): $(LUAC_O) $(LUA_A) $(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) $(ARCH) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
clean: clean:
$(RM) $(ALL_T) $(ALL_O) $(RM) $(ALL_T) $(ALL_O)
@ -84,7 +84,7 @@ aix:
$(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall" $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
ansi: ansi:
$(MAKE) all MYCFLAGS=-DLUA_ANSI ARCH="$(ARCH)" $(MAKE) all MYCFLAGS=-DLUA_ANSI
bsd: bsd:
$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E" $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"

3
src/Makefile
View File

@ -46,6 +46,7 @@ endif
CCLINK+= $(ALLOC_LINK) CCLINK+= $(ALLOC_LINK)
CFLAGS+= $(ALLOC_FLAGS) CFLAGS+= $(ALLOC_FLAGS)
LUA_CFLAGS+= $(ARCH)
CCOPT= $(CFLAGS) $(ARCH) $(PROF) CCOPT= $(CFLAGS) $(ARCH) $(PROF)
@ -167,7 +168,7 @@ dependencies:
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR) @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
@cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" @cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)Lua ansi$(ENDCOLOR) @echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)Lua ansi$(ENDCOLOR)
@cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" CFLAGS="$(LUA_CFLAGS)" ansi @cd ../deps/lua && $(MAKE) CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(ARCH)" ansi
../deps/jemalloc/lib/libjemalloc.a: ../deps/jemalloc/lib/libjemalloc.a:
cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a