Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

long GUID cannot beyond 65535 patch #596

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions kbe/src/build/common.mak
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ ifndef DISABLE_WATCHERS
CPPFLAGS += -DENABLE_WATCHERS
endif

KBE_INCLUDES += -I $(KBE_ROOT)/kbe/src/lib/dependencies/uuid
LIBUUID_LIB=$(LIBDIR)/libuuid.a
LDLIBS += -luuid

ifdef USE_PYTHON
USE_KBE_PYTHON = 1
KBE_INCLUDES += -I $(KBE_ROOT)/kbe/src/lib/python/Include
Expand Down
2 changes: 2 additions & 0 deletions kbe/src/lib/Makefile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ LIBDIR=$(KBE_ROOT)/kbe/src/lib/bin

all install clean full:
test -d $(LIBDIR) || mkdir $(LIBDIR)
sudo apt install automake
cd dependencies/uuid && ./configure && $(MAKE) $@ && if ! test -e ../../../libs/libuuid.a; then \cp -f ".libs/libuuid.a" "../../../libs"; fi
cd dependencies/openssl && $(MAKE) $@ && if ! test -e ../../../libs/libssl.a; then \cp -f "libssl.a" "../../../libs"; fi && if ! test -e ../../../libs/libcrypto.a; then \cp -f "libcrypto.a" "../../../libs"; fi
cd dependencies/hiredis && $(MAKE) $@
cd dependencies/zip && $(MAKE) $@
Expand Down
3 changes: 2 additions & 1 deletion kbe/src/lib/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ ifndef KBE_ROOT
export KBE_ROOT := $(subst /kbe/src/lib/$(LIB),,$(CURDIR))
endif

include $(KBE_ROOT)/kbe/src/build/common.mak
include $(KBE_ROOT)/kbe/src/build/common.mak
KBE_INCLUDES += -I $(KBE_ROOT)/kbe/src/lib/dependencies/uuid