* [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.8.5/
@ 2019-12-31 2:41 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2019-12-31 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 9d7400647007044b5248f281477145a926c9b217
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 02:27:16 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 02:35:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9d740064
patches/thin-provisioning-tools: update build fixes
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch
index df0831f..95f49fb 100644
--- a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch
+++ b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch
@@ -12,6 +12,15 @@
ifeq ("@DEVTOOLS@", "yes")
CXXFLAGS+=-DDEV_TOOLS
+@@ -346,7 +348,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
+
--- thin-provisioning-tools-0.7.0/unit-tests/Makefile.in
+++ thin-provisioning-tools-0.7.0/unit-tests/Makefile.in
@@ -25,7 +25,7 @@
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.8.5/
@ 2019-12-31 2:41 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2019-12-31 2:41 UTC (permalink / raw
To: gentoo-commits
commit: c3afe9b0972272a1914dc981ba547a06ff693a38
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 02:27:58 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 02:35:31 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c3afe9b0
gkbuilds/thin-provisioning-tools: Don't generate man pages
Package is shipping own txt2man utility which tries to use ksh in some
situations causing a build failure when ksh isn't present.
However, we don't need man pages. This commit will add a patch
which will skip generation of man pages.
Closes: https://bugs.gentoo.org/704330
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...thin-provisioning-tools-0.8.5-no-manpages.patch | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-no-manpages.patch b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-no-manpages.patch
new file mode 100644
index 0000000..25f6381
--- /dev/null
+++ b/patches/thin-provisioning-tools/0.8.5/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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.8.5/
@ 2020-07-16 15:03 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-07-16 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 42e05ff341da60fb4caf689a45a50befea4327ad
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:12:28 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=42e05ff3
thin-provisioning-tools: Honor toolchain
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...thin-provisioning-tools-0.7.0-build-fixes.patch | 43 -------
...thin-provisioning-tools-0.8.5-build-fixes.patch | 132 +++++++++++++++++++++
2 files changed, 132 insertions(+), 43 deletions(-)
diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch
deleted file mode 100644
index 95f49fb..0000000
--- a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- thin-provisioning-tools-0.7.0/Makefile.in
-+++ thin-provisioning-tools-0.7.0/Makefile.in
-@@ -142,9 +142,9 @@
-
- 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
-@@ -346,7 +348,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
-
---- thin-provisioning-tools-0.7.0/unit-tests/Makefile.in
-+++ thin-provisioning-tools-0.7.0/unit-tests/Makefile.in
-@@ -25,7 +25,7 @@
- -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) \
-@@ -83,7 +83,7 @@
- sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
- $(RM) $*.$$$$
-
--unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
-+unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a
- @echo " [LD] $<"
- $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
-
diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch
new file mode 100644
index 0000000..b78a758
--- /dev/null
+++ b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch
@@ -0,0 +1,132 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -150,9 +150,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
+@@ -230,7 +230,7 @@ endif
+ lib/libpdata.a: $(OBJECTS) $(EMITTERS)
+ @echo " [AR] $<"
+ @mkdir -p $(dir $@)
+- $(V)ar -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1
++ $(V)$(AR) -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1
+
+ bin/pdata_tools: $(OBJECTS) $(EMITTERS)
+ @echo " [LD] $@"
+@@ -346,7 +346,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/contrib/Makefile.in
++++ b/contrib/Makefile.in
+@@ -16,7 +16,7 @@ contrib/%.o: contrib/%.cc
+
+ contrib/%.a: contrib/%.o
+ $(V)echo " [AR] $@"
+- $(V)ar rcs $@ $^
++ $(V)$(AR) rcs $@ $^
+
+ contrib/%.so: contrib/%.a
+ $(V)echo " [LD] $@"
+--- 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) \
+@@ -36,11 +36,11 @@ GMOCK_DEPS=\
+ lib/libgmock.a: $(GMOCK_DEPS)
+ @echo " [CXX] gtest"
+ @mkdir -p lib
+- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc
++ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc
+ @echo " [CXX] gmock"
+- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc
++ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc
+ @echo " [AR] $<"
+- $(V)ar -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1
++ $(V)$(AR) -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1
+
+ TEST_SOURCE=\
+ unit-tests/gmock_main.cc \
+@@ -86,10 +86,10 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
+ sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
+ $(RM) $*.$$$$
+
+-unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
++unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a
+ @echo " [LD] $<"
+ @mkdir -p $(dir $@)
+- $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
++ $(V)$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
+
+ .PHONY: unit-test
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-16 15:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-31 2:41 [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.8.5/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2020-07-16 15:03 Thomas Deutschmann
2019-12-31 2:41 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox