Skip to content

Commit

Permalink
fix(mk): remove deprecated helper-targets and adjust config-slim
Browse files Browse the repository at this point in the history
The mk-config-helper-targets for various features were previously
convenient as examples of disabling features requiring third-party
subproject-provided libraries.

However, now that the build links with the dependencies available on the
system. Then, third-party dependencies are simply disabled when not
available. Thus, those targets are no longer needed.

The exception to this is SPDK. Thus, the 'config-slim' is an example of
turning off the SPDK subproject. It also shows how to turn off a
third-party library, even though it is readily available on the system.

Signed-off-by: Simon A. F. Lund <simon.lund@samsung.com>
  • Loading branch information
safl committed Sep 5, 2023
1 parent f2dd2a6 commit 2431683
Showing 1 changed file with 7 additions and 29 deletions.
36 changes: 7 additions & 29 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,43 +93,21 @@ endef
.PHONY: config-debug
config-debug:
@echo "## xNVMe: make config-debug"
CC=$(CC) CXX=$(CXX) $(MESON) setup $(BUILD_DIR) --buildtype=debug
@echo "## xNVMe: make config-debug [DONE]"

define config-uring-help
# Configure Meson to compile xNVMe without: SPDK, and libvfn
endef
.PHONY: config-uring
config-uring:
@echo "## xNVMe: config-uring"
CC=$(CC) CXX=$(CXX) $(MESON) setup $(BUILD_DIR) \
-Dwith-spdk=disabled \
-Dwith-liburing=enabled \
-Dwith-libvfn=disabled
@echo "## xNVMe: config-uring [DONE]"

define config-libvfn-help
# Configure Meson to compile xNVMe without: SPDK, and liburing
endef
.PHONY: config-libvfn
config-libvfn:
@echo "## xNVMe: config-libvfn"
CC=$(CC) CXX=$(CXX) $(MESON) setup $(BUILD_DIR) \
-Dwith-spdk=disabled \
-Dwith-liburing=disabled \
-Dwith-libvfn=enabled
@echo "## xNVMe: config-uring [DONE]"
--buildtype=debug
@echo "## xNVMe: make config-debug [DONE]"

define config-slim-help
# Configure Meson to compile xNVMe without: SPDK, liburing, and libvfn
# Configure Meson to compile xNVMe without any third-part libraries
endef
.PHONY: config-slim
config-slim:
@echo "## xNVMe: make config-slim"
CC=$(CC) CXX=$(CXX) $(MESON) setup $(BUILD_DIR) \
-Dwith-spdk=disabled \
-Dwith-liburing=disabled \
-Dwith-libvfn=disabled
-Dwith-spdk=false \
-Dwith-liburing=disabled \
-Dwith-libvfn=disabled \
-Dwith-libaio=disabled
@echo "## xNVMe: make config-slim [DONE]"

define docker-help
Expand Down

0 comments on commit 2431683

Please sign in to comment.