commit: ac73470ace408e119778067463c8bb2f0ec99711 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Sun Nov 15 17:12:46 2020 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Sun Nov 15 17:14:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac73470a
sys-fs/mhddfs: reorganize patches to respect CFLAGS and LDFLAGS Reported-by: Agostino Sarubbo <ago <AT> gentoo.org> Closes: https://bugs.gentoo.org/726002 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch | 17 ----------------- sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch | 7 ++++--- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch index 493a7839619..74132c158dc 100644 --- a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch +++ b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch @@ -178,23 +178,6 @@ Thanks to Gabor Kovari <[email protected]> " mhddfs dir1,dir2.. mountpoint [ -o OPTIONS ]\n" --- a/Makefile 2016-01-05 16:45:10.184105001 +0100 +++ b/Makefile 2015-12-21 16:32:29.000000000 +0100 -@@ -22,13 +22,13 @@ - - TARGET = mhddfs - --CFLAGS += -Wall $(shell pkg-config fuse --cflags) \ -- -DFUSE_USE_VERSION=26 -MMD -+CFLAGS = -Wall $(shell pkg-config fuse glib-2.0 --cflags) \ -+ -DFUSE_USE_VERSION=26 -MMD -g -rdynamic -O0 - ifdef WITHOUT_XATTR - CFLAGS += -DWITHOUT_XATTR - endif - --LIBS = $(shell pkg-config fuse --libs) -+LDFLAGS = $(shell pkg-config fuse glib-2.0 --libs) - - FORTAR = src COPYING LICENSE README Makefile \ - README.ru.UTF-8 ChangeLog mhddfs.1 \ @@ -53,7 +53,7 @@ ifeq ($(DEBVERSION), $(VERSION)) all: $(TARGET) diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch index 0c6f24f4d1a..278c9876da7 100644 --- a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch +++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch @@ -5,14 +5,15 @@ TARGET = mhddfs -CFLAGS = -Wall $(shell pkg-config fuse --cflags) \ -+CFLAGS += -Wall $(shell pkg-config fuse --cflags) \ - -DFUSE_USE_VERSION=26 -MMD +- -DFUSE_USE_VERSION=26 -MMD ++CFLAGS += -Wall $(shell pkg-config fuse glib-2.0 --cflags) \ ++ -DFUSE_USE_VERSION=26 -MMD -rdynamic ifdef WITHOUT_XATTR CFLAGS += -DWITHOUT_XATTR endif -LDFLAGS = $(shell pkg-config fuse --libs) -+LIBS = $(shell pkg-config fuse --libs) ++LIBS = $(shell pkg-config fuse glib-2.0 --libs) FORTAR = src COPYING LICENSE README Makefile \ README.ru.UTF-8 ChangeLog mhddfs.1 \
