diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2021-02-08 22:14:19 +0100 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-02-08 22:41:49 +0100 |
commit | 6e384bd92ffccb260caf42fbea1d9fac6a64d41f (patch) | |
tree | d66a97214bd2b76a94caf2cfd8625ebc00fc066c /patches/thin-provisioning-tools/0.9.0 | |
parent | Bump xfsprogs to v5.10.0 (diff) | |
download | genkernel-6e384bd92ffccb260caf42fbea1d9fac6a64d41f.tar.gz genkernel-6e384bd92ffccb260caf42fbea1d9fac6a64d41f.tar.bz2 genkernel-6e384bd92ffccb260caf42fbea1d9fac6a64d41f.zip |
Bump thin-provisioning-tools to v0.9.0
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'patches/thin-provisioning-tools/0.9.0')
-rw-r--r-- | patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch | 27 | ||||
-rw-r--r-- | patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch | 85 |
2 files changed, 112 insertions, 0 deletions
diff --git a/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch new file mode 100644 index 0000000..25f6381 --- /dev/null +++ b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch @@ -0,0 +1,27 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -279,7 +279,7 @@ TOOLS:=\ + + MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) + +-install: bin/pdata_tools $(MANPAGES) ++install: bin/pdata_tools + $(INSTALL_DIR) $(BINDIR) + $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) + $(STRIP) $(BINDIR)/pdata_tools +@@ -302,6 +302,7 @@ install: bin/pdata_tools $(MANPAGES) + ln -s -f pdata_tools $(BINDIR)/era_dump + ln -s -f pdata_tools $(BINDIR)/era_invalidate + ln -s -f pdata_tools $(BINDIR)/era_restore ++ifeq ("@INSTALLMANPAGES@", "yes") + $(INSTALL_DIR) $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_check.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_dump.8 $(MANPATH)/man8 +@@ -322,6 +323,7 @@ install: bin/pdata_tools $(MANPAGES) + $(INSTALL_DATA) man8/era_restore.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/era_invalidate.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/thin_trim.8 $(MANPATH)/man8 ++endif + ifeq ("@DEVTOOLS@", "yes") + ln -s -f pdata_tools $(BINDIR)/thin_show_duplicates + ln -s -f pdata_tools $(BINDIR)/thin_ll_dump diff --git a/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch new file mode 100644 index 0000000..802c434 --- /dev/null +++ b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch @@ -0,0 +1,85 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -160,9 +160,9 @@ endif + + TOP_DIR:=@top_srcdir@ + TOP_BUILDDIR:=@top_builddir@ +-CFLAGS+=-g -Wall -O3 -fPIC ++CFLAGS+=-fPIC + CFLAGS+=@LFS_FLAGS@ +-CXXFLAGS+=-g -Wall -fPIC -fno-strict-aliasing -std=c++11 ++CXXFLAGS+=-fPIC -fno-strict-aliasing -std=c++11 + + ifeq ("@DEVTOOLS@", "yes") + CXXFLAGS+=-DDEV_TOOLS +@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE)) + + lib/libft.so: $(LIBFT_OBJECTS) + @echo " [LD]" $@ +- $(V) gcc -shared -o $@ $+ -laio ++ $(V) $(CC) -shared -o $@ $+ -laio + + .PHONEY: functional-test unit-test + +--- a/configure.ac ++++ b/configure.ac +@@ -35,6 +35,8 @@ AC_LANG(C++) + + ################################################################ + dnl -- Checks for programs. ++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR],[ar])]) ++AC_PROG_AR + AC_PROG_SED + AC_PROG_AWK + AC_PROG_LN_S +--- a/functional-tests/bcache/Makefile ++++ b/functional-tests/bcache/Makefile +@@ -1,8 +1,8 @@ + bcache.so: bcache.o +- gcc -shared -o $@ $< -laio ++ $(CC) -shared -o $@ $< -laio + + bcache.o: bcache.c +- gcc -std=gnu11 -fpic -I. -Wall -c -o $@ $< ++ $(CC) -std=gnu11 -fpic -I. -Wall -c -o $@ $< + + .PHONEY: clean + clean: +--- a/functional-tests/crc32c/Makefile ++++ b/functional-tests/crc32c/Makefile +@@ -1,8 +1,8 @@ + crc32c.so: crc32c.o +- gcc -shared -o $@ $< -laio ++ $(CC) -shared -o $@ $< -laio + + crc32c.o: crc32c.c +- gcc -std=gnu11 -fpic -I. -Wall -c -o $@ $< ++ $(CC) -std=gnu11 -fpic -I. -Wall -c -o $@ $< + + .PHONEY: clean + clean: +--- a/functional-tests/device-mapper/Makefile ++++ b/functional-tests/device-mapper/Makefile +@@ -1,8 +1,8 @@ + dm-ioctl.so: dm-ioctl.o +- gcc -shared -o $@ $< -laio ++ $(CC) -shared -o $@ $< -laio + + dm-ioctl.o: dm-ioctl.c +- gcc -std=gnu11 -fpic -I. -Wall -c -o $@ $< ++ $(CC) -std=gnu11 -fpic -I. -Wall -c -o $@ $< + + .PHONEY: clean + clean: +--- a/unit-tests/Makefile.in ++++ b/unit-tests/Makefile.in +@@ -25,7 +25,7 @@ GMOCK_FLAGS=\ + -Wno-unused-local-typedefs + + GMOCK_LIBS=\ +- -Llib -lpdata -lgmock -lpthread -laio ++ -Llib -lpdata -lgmock -lpthread -laio -lgtest + + GMOCK_DEPS=\ + $(wildcard $(GMOCK_DIR)/googlemock/include/*.h) \ + |