The makefile currently automatically detects if certain optional libraries are present on the file system and links with them if they are. This isn't always desired though: users may not want to link against those libraries even if they do exist. Add new variables that when set to 0 will force the corresponding optional library off. Signed-off-by: Chirantan Ekbote <chirantan@xxxxxxxxxxxx> --- Makefile | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index eeb54a4..69daa1e 100644 --- a/Makefile +++ b/Makefile @@ -250,26 +250,33 @@ ifeq (y,$(ARCH_HAS_FRAMEBUFFER)) endif endif -ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz),y) - CFLAGS_DYNOPT += -DCONFIG_HAS_ZLIB - LIBS_DYNOPT += -lz -else - NOTFOUND += zlib -endif -ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz -static),y) - CFLAGS_STATOPT += -DCONFIG_HAS_ZLIB - LIBS_STATOPT += -lz -endif +# Define USE_ZLIB=0 to disable zlib. +ifneq ($(USE_ZLIB),0) + ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz),y) + CFLAGS_DYNOPT += -DCONFIG_HAS_ZLIB + LIBS_DYNOPT += -lz + else + NOTFOUND += zlib + endif -ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio),y) - CFLAGS_DYNOPT += -DCONFIG_HAS_AIO - LIBS_DYNOPT += -laio -else - NOTFOUND += aio + ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz -static),y) + CFLAGS_STATOPT += -DCONFIG_HAS_ZLIB + LIBS_STATOPT += -lz + endif endif -ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio -static),y) - CFLAGS_STATOPT += -DCONFIG_HAS_AIO - LIBS_STATOPT += -laio + +# Define USE_AIO=0 to disable libaio. +ifneq ($(USE_AIO),0) + ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio),y) + CFLAGS_DYNOPT += -DCONFIG_HAS_AIO + LIBS_DYNOPT += -laio + else + NOTFOUND += aio + endif + ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio -static),y) + CFLAGS_STATOPT += -DCONFIG_HAS_AIO + LIBS_STATOPT += -laio + endif endif ifeq ($(LTO),1) -- 2.11.0.483.g087da7b7c-goog -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
