Skip to content

Commit

Permalink
NVML: support compilation in lbv2 build system.
Browse files Browse the repository at this point in the history
1. Use specific container for compile nvme instead dockerize.
2. Add lbv2 for lbyaml v2 support.
3. Fix some errors with newer GCC shutoff flags and change defaults

This change coexist with current build system (dockerize and lb-build)

Signed-off-by: Maor Vanmak <[email protected]>
  • Loading branch information
maor-lb committed Dec 8, 2022
1 parent 0da83c2 commit 36f5cfe
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
9 changes: 9 additions & 0 deletions Makefile.container
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
include $(WORKSPACE_TOP)/lb_containers/Makefile.container


TARGETS := $(shell make -f Makefile.lb list_flat)

$(TARGETS): proto_container
${Q}run_in_container -i lbproto:${LBPROTO_CONTAINER_VERSION} -- ${MAKE} -f Makefile.lb 'EXTRA_CFLAGS=-Wno-maybe-uninitialized -Wno-switch-outside-range -fPIC -Wno-array-parameter' $@ -j10

.PHONY: $(TARGETS)
11 changes: 8 additions & 3 deletions Makefile.lb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ include $(WORKSPACE_TOP)/common/Makefile.env

PMEM_INSTALL_DIR ?= $(shell component-tool localpath --repo=nvml --type=$(BUILD_TYPE) pmem-sdk)

build:
all: build

build:
$(Q)$(MAKE)

install: build
$(Q)$(MAKE) -C src install prefix=$(PMEM_INSTALL_DIR)

checkin:
checkin:
$(Q)component-tool checkin --repo=nvml --type=$(BUILD_TYPE) pmem-sdk

.PHONY: install checkin
list_flat:
$(Q)$(call list_flat)

.PHONY: install checkin list_flat
8 changes: 8 additions & 0 deletions lbv2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
nvml:
pmem-sdk:
build:
- make -f Makefile.container all
install:
- make -f Makefile.container install
deps:
- file://.

0 comments on commit 36f5cfe

Please sign in to comment.