commit: ce3a2a7b998284e578df9e515450c2962ceacf68 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Feb 12 11:02:20 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Feb 12 22:35:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce3a2a7b
sys-fs/mergerfs: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/19424 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...akefiles-fixes-ar-cflags-cxxflags-ldflags.patch | 83 ---------------------- 1 file changed, 83 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 deleted file mode 100644 index 05166bacd87..00000000000 --- a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 -
