From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EFED138359 for ; Thu, 16 Jul 2020 15:03:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A6A3E087A; Thu, 16 Jul 2020 15:03:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F041E087A for ; Thu, 16 Jul 2020 15:03:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78E8B34F1F2 for ; Thu, 16 Jul 2020 15:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 093D42F5 for ; Thu, 16 Jul 2020 15:03:23 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1594909757.42e05ff341da60fb4caf689a45a50befea4327ad.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.8.5/ X-VCS-Repository: proj/genkernel X-VCS-Files: patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.7.0-build-fixes.patch patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch X-VCS-Directories: patches/thin-provisioning-tools/0.8.5/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 42e05ff341da60fb4caf689a45a50befea4327ad X-VCS-Branch: master Date: Thu, 16 Jul 2020 15:03:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c301ff7-be9b-4701-ab34-ee8da0c1dc9d X-Archives-Hash: 90ddbcca43c856b16af66abd81e6720b commit: 42e05ff341da60fb4caf689a45a50befea4327ad Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jul 14 16:12:28 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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 +