diff options
| author |   Piotr Karbowski <slashbeast@gentoo.org> | 2020-08-08 21:59:01 +0200 |
|---|---|---|
| committer | Piotr Karbowski <slashbeast@gentoo.org> | 2020-08-08 22:00:27 +0200 |
| commit | 4862dc8bd86bb9810de3088b4ffacc42015736f0 (patch) | |
| tree | f460a52365ba6d97d649a2a36e19e35294fe152a /sys-fs/mergerfs/files | |
| parent | kde.org.eclass: Switch EGIT_MIRROR to https://invent.kde.org/kde (diff) | |
| download | gentoo-4862dc8bd86bb9810de3088b4ffacc42015736f0.tar.gz gentoo-4862dc8bd86bb9810de3088b4ffacc42015736f0.tar.bz2 gentoo-4862dc8bd86bb9810de3088b4ffacc42015736f0.zip | |
sys-fs/mergerfs: 2.30.0 bump
Version bump; Now uses environmental provided AR, CFLAGS, CXXFLAGS and LDFLAGS.
Closes: https://bugs.gentoo.org/725978
Closes: https://bugs.gentoo.org/728158
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>
Diffstat (limited to 'sys-fs/mergerfs/files')
| -rw-r--r-- | sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch new file mode 100644 index 000000000000..05166bacd874 --- /dev/null +++ b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch @@ -0,0 +1,83 @@ +diff --git a/Makefile b/Makefile +index 6c38066..d98021c 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,13 +61,14 @@ SRC = $(wildcard src/*.cpp) + OBJS = $(SRC:src/%.cpp=build/%.o) + DEPS = $(SRC:src/%.cpp=build/%.d) + MANPAGE = mergerfs.1 +-CXXFLAGS = \ ++CXXFLAGS ?= ${OPT_FLAGS} ++CXXFLAGS := \ ++ ${CXXFLAGS} \ + -std=c++0x \ +- $(OPT_FLAGS) \ + $(STATIC_FLAGS) \ + $(LTO_FLAGS) \ + -Wall \ +- -Wno-unused-result \ ++ -Wno-unused-result \ + -MMD + FUSE_FLAGS = \ + -Ilibfuse/include \ +@@ -76,9 +77,11 @@ FUSE_FLAGS = \ + MFS_FLAGS = \ + -DUSE_XATTR=$(USE_XATTR) \ + -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK) +-LDFLAGS = \ +- -pthread \ +- -lrt ++ ++LDFLAGS := \ ++ ${LDFLAGS} \ ++ -pthread \ ++ -lrt + + DESTDIR = + PREFIX = /usr/local +diff --git a/libfuse/Makefile b/libfuse/Makefile +index e3001aa..2bbc45a 100644 +--- a/libfuse/Makefile ++++ b/libfuse/Makefile +@@ -29,6 +29,8 @@ INSTALLBINDIR = $(DESTDIR)$(BINDIR) + INSTALLSBINDIR = $(DESTDIR)$(SBINDIR) + INSTALLMAN1DIR = $(DESTDIR)$(MAN1DIR) + ++AR ?= ar ++ + SRC = \ + lib/buffer.c \ + lib/cuse_lowlevel.c \ +@@ -46,9 +48,10 @@ SRC = \ + lib/mount.c + OBJS = $(SRC:lib/%.c=build/%.o) + DEPS = $(SRC:lib/%.c=build/%.d) +- +-CFLAGS = \ +- $(OPT_FLAGS) \ ++CFLAGS ?= \ ++ $(OPT_FLAGS) ++CFLAGS := \ ++ ${CFLAGS} \ + -Wall \ + -pipe \ + -MMD +@@ -61,7 +64,8 @@ FUSE_FLAGS = \ + -DFUSE_USE_VERSION=29 \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + -DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\" +-LDFLAGS = \ ++LDFLAGS := \ ++ ${LDFLAGS} \ + -lrt \ + -pthread + +@@ -78,7 +82,7 @@ objects: build/config.h + $(MAKE) $(OBJS) + + build/libfuse.a: objects +- ar rcs build/libfuse.a $(OBJS) ++ ${AR} rcs build/libfuse.a $(OBJS) + + utils: mergerfs-fusermount mount.mergerfs + |