X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=e852381dd362447e6d1138c7e87b28e7fabcfc91;hb=4ee9ebc32e45b1578a0109e2e3487979ec4d1034;hp=f8b021610ffa20f26cca4719affbed898d5e780c;hpb=05c98795249f5ed6cff0a158873643743b4c79d9;p=bcachefs-tools-debian diff --git a/Makefile b/Makefile index f8b0216..e852381 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PREFIX?=/usr/local PKG_CONFIG?=pkg-config INSTALL=install PYTEST=pytest-3 -CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ +CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall -fPIC \ -Wno-pointer-sign \ -fno-strict-aliasing \ -fno-delete-null-pointer-checks \ @@ -19,29 +19,24 @@ CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ -DVERSION_STRING='"$(VERSION)"' \ $(EXTRA_CFLAGS) LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS) +CARGO_ARGS= +CARGO=cargo $(CARGO_ARGS) +CARGO_PROFILE=release +# CARGO_PROFILE=debug +CARGO_BUILD_ARGS=--$(CARGO_PROFILE) +CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit) -CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version') +include Makefile.compiler -ifneq (,$(findstring gcc,$(CC_VERSION))) - CFLAGS+=-Wno-unused-but-set-variable \ - -Wno-zero-length-bounds \ - -Wno-stringop-overflow -endif - -ifneq (,$(findstring clang,$(CC_VERSION))) - CFLAGS+=-Wno-missing-braces \ - -Wno-zero-length-array \ - -Wno-shift-overflow \ - -Wno-enum-conversion -endif - -ifdef BCACHEFS_DEBUG - CFLAGS+=-Werror - CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y -endif - CFLAGS+=-DCONFIG_VALGRIND=y +CFLAGS+=$(call cc-disable-warning, unused-but-set-variable) +CFLAGS+=$(call cc-disable-warning, stringop-overflow) +CFLAGS+=$(call cc-disable-warning, zero-length-bounds) +CFLAGS+=$(call cc-disable-warning, missing-braces) +CFLAGS+=$(call cc-disable-warning, zero-length-array) +CFLAGS+=$(call cc-disable-warning, shift-overflow) +CFLAGS+=$(call cc-disable-warning, enum-conversion) PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev" ifdef BCACHEFS_FUSE @@ -60,7 +55,6 @@ endif CFLAGS+=$(PKGCONFIG_CFLAGS) LDLIBS+=$(PKGCONFIG_LDLIBS) - LDLIBS+=-lm -lpthread -lrt -lscrypt -lkeyutils -laio -ldl LDLIBS+=$(EXTRA_LDLIBS) @@ -72,27 +66,28 @@ else INITRAMFS_DIR=/etc/initramfs-tools endif -var := $(shell rst2man 2>/dev/null) -ifeq ($(.SHELLSTATUS),0) +STATUS:=$(shell rst2man -V 2>/dev/null; echo $$?) +ifeq ($(STATUS),0) RST2MAN=rst2man endif -var := $(shell rst2man.py 2>/dev/null) -ifeq ($(.SHELLSTATUS),0) +STATUS:=$(shell rst2man.py -V 2>/dev/null; echo $$?) +ifeq ($(STATUS),0) RST2MAN=rst2man.py endif -undefine var - .PHONY: all -all: bcachefs bcachefs.5 +all: bcachefs bcachefs.5 lib + +.PHONY: lib +lib: libbcachefs.so .PHONY: tests tests: tests/test_helper .PHONY: check check: tests bcachefs - cd tests; $(PYTEST) + $(PYTEST) .PHONY: TAGS tags TAGS: @@ -105,9 +100,13 @@ DOCSRC := opts_macro.h bcachefs.5.rst.tmpl DOCGENERATED := bcachefs.5 doc/bcachefs.5.rst DOCDEPS := $(addprefix ./doc/,$(DOCSRC)) bcachefs.5: $(DOCDEPS) libbcachefs/opts.h +ifneq (,$(RST2MAN)) $(CC) doc/opts_macro.h -I libbcachefs -I include -E 2>/dev/null \ | doc/macro2rst.py $(RST2MAN) doc/bcachefs.5.rst bcachefs.5 +else + @echo "WARNING: no rst2man found! Man page not generated." +endif SRCS=$(shell find . -type f -iname '*.c') DEPS=$(SRCS:.c=.d) @@ -116,19 +115,25 @@ DEPS=$(SRCS:.c=.d) OBJS=$(SRCS:.c=.o) bcachefs: $(filter-out ./tests/%.o, $(OBJS)) -MOUNT_SRCS=$(shell find mount/src -type f -iname '*.rs') \ - mount/Cargo.toml mount/Cargo.lock mount/build.rs +RUST_SRCS=$(shell find rust-src/ -type f -iname '*.rs') +MOUNT_SRCS=$(filter %mount, $(RUST_SRCS)) debug: CFLAGS+=-Werror -DCONFIG_BCACHEFS_DEBUG=y -DCONFIG_VALGRIND=y debug: bcachefs -libbcachefs_mount.a: $(MOUNT_SRCS) - LIBBCACHEFS_INCLUDE=$(CURDIR) cargo build --manifest-path mount/Cargo.toml --release - cp mount/target/release/libbcachefs_mount.a $@ - MOUNT_OBJ=$(filter-out ./bcachefs.o ./tests/%.o ./cmd_%.o , $(OBJS)) -mount.bcachefs: libbcachefs_mount.a $(MOUNT_OBJ) - $(CC) -Wl,--gc-sections libbcachefs_mount.a $(MOUNT_OBJ) -o $@ $(LDLIBS) +libbcachefs.so: LDFLAGS+=-shared +libbcachefs.so: $(MOUNT_OBJ) + $(CC) $(LDFLAGS) $+ -o $@ $(LDLIBS) + +MOUNT_TOML=rust-src/mount/Cargo.toml +mount.bcachefs: lib $(MOUNT_SRCS) + LIBBCACHEFS_LIB=$(CURDIR) \ + LIBBCACHEFS_INCLUDE=$(CURDIR) \ + $(CARGO_BUILD) --manifest-path $(MOUNT_TOML) + + ln -f rust-src/mount/target/$(CARGO_PROFILE)/bcachefs-mount $@ + tests/test_helper: $(filter ./tests/%.o, $(OBJS)) @@ -145,7 +150,7 @@ cmd_version.o : .version .PHONY: install install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs -install: bcachefs +install: bcachefs lib $(INSTALL) -m0755 -D bcachefs -t $(DESTDIR)$(ROOT_SBINDIR) $(INSTALL) -m0755 fsck.bcachefs $(DESTDIR)$(ROOT_SBINDIR) $(INSTALL) -m0755 mkfs.bcachefs $(DESTDIR)$(ROOT_SBINDIR) @@ -153,13 +158,15 @@ install: bcachefs $(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT) $(INSTALL) -m0755 -D initramfs/hook $(DESTDIR)$(INITRAMFS_HOOK) $(INSTALL) -m0755 -D mount.bcachefs.sh $(DESTDIR)$(ROOT_SBINDIR) + $(INSTALL) -m0755 -D libbcachefs.so -t $(PREFIX)/lib/ + sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK) echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK) .PHONY: clean clean: $(RM) bcachefs mount.bcachefs libbcachefs_mount.a tests/test_helper .version $(OBJS) $(DEPS) $(DOCGENERATED) - $(RM) -rf mount/target + $(RM) -rf rust-src/*/target .PHONY: deb deb: all @@ -185,6 +192,8 @@ update-bcachefs-sources: git add include/linux/list_nulls.h cp $(LINUX_DIR)/include/linux/poison.h include/linux/ git add include/linux/poison.h + cp $(LINUX_DIR)/scripts/Makefile.compiler ./ + git add Makefile.compiler $(RM) libbcachefs/*.mod.c git -C $(LINUX_DIR) rev-parse HEAD | tee .bcachefs_revision git add .bcachefs_revision