commit: 68a56794e2d35c9233511ec1c2da89c2d10d6473 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Sun Apr 8 20:23:42 2018 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Sun Apr 15 14:22:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a56794
dev-cpp/tbb: clean duplicate patches Closes: https://github.com/gentoo/gentoo/pull/7898 Package-Manager: Portage-2.3.28, Repoman-2.3.9 dev-cpp/tbb/files/tbb-2017.20161128-build.patch | 6 ------ dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch | 15 --------------- dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch | 4 ++-- dev-cpp/tbb/files/tbb-4.3.20150611-build.patch | 11 ----------- dev-cpp/tbb/files/tbb-4.4.20160803-build.patch | 6 ------ dev-cpp/tbb/tbb-2017.20161128.ebuild | 6 +++--- dev-cpp/tbb/tbb-4.4.20160803.ebuild | 6 +++--- 7 files changed, 8 insertions(+), 46 deletions(-) diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch index 0806d6a522b..e952bfbc434 100644 --- a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch +++ b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch @@ -1,5 +1,3 @@ -diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc -index e93f8f4..2b43c51 100644 --- a/build/FreeBSD.gcc.inc +++ b/build/FreeBSD.gcc.inc @@ -28,8 +28,8 @@ WARNING_KEY = -Wall @@ -46,8 +44,6 @@ index e93f8f4..2b43c51 100644 TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o endif -diff --git a/build/linux.clang.inc b/build/linux.clang.inc -index 237caae..8d6914e 100644 --- a/build/linux.clang.inc +++ b/build/linux.clang.inc @@ -31,15 +31,15 @@ DYLIB_KEY = -shared @@ -107,8 +103,6 @@ index 237caae..8d6914e 100644 ifeq ($(cfg),debug) ASM_FLAGS += -g endif -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index b7ed0c5..a8e8f85 100644 --- a/build/linux.gcc.inc +++ b/build/linux.gcc.inc @@ -32,12 +32,12 @@ DYLIB_KEY = -shared diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch b/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch deleted file mode 100644 index 5935017a325..00000000000 --- a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=418447 - ---- a/build/Makefile.test -+++ b/build/Makefile.test -@@ -44,8 +44,8 @@ - USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY - CPLUS_FLAGS += $(USE_PROXY_FLAG) - LINK_TBB.LIB = $(PROXY.LIB) -- LIBS += $(LIBDL) --endif -+endif -+LIBS += $(LIBDL) - - TEST_SUFFIXES=secondary compiler_builtins pic - include $(tbb_root)/build/common_rules.inc diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch index 099bb39d214..ed318cab838 100644 --- a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch +++ b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch @@ -5,8 +5,8 @@ Subject: build system fix underlinking in test phase wrt https://bugs.gentoo.org/show_bug.cgi?id=418447 ---- build/Makefile.test -+++ build/Makefile.test +--- a/build/Makefile.test ++++ b/build/Makefile.test @@ -48,8 +48,8 @@ USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY CPLUS_FLAGS += $(USE_PROXY_FLAG) diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch index 42a8bae4640..8f806989e44 100644 --- a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch +++ b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch @@ -1,10 +1,3 @@ - build/FreeBSD.gcc.inc | 18 ++++-------------- - build/linux.clang.inc | 26 +++----------------------- - build/linux.gcc.inc | 38 +++++++------------------------------- - 3 files changed, 14 insertions(+), 68 deletions(-) - -diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc -index 20f0027..8bbdeba 100644 --- a/build/FreeBSD.gcc.inc +++ b/build/FreeBSD.gcc.inc @@ -28,14 +28,14 @@ WARNING_KEY = -Wall @@ -49,8 +42,6 @@ index 20f0027..8bbdeba 100644 TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o endif -diff --git a/build/linux.clang.inc b/build/linux.clang.inc -index de9aee5..3a366f1 100644 --- a/build/linux.clang.inc +++ b/build/linux.clang.inc @@ -31,15 +31,15 @@ DYLIB_KEY = -shared @@ -110,8 +101,6 @@ index de9aee5..3a366f1 100644 ifeq ($(cfg),debug) ASM_FLAGS += -g endif -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index 4b7122b..e8ba711 100644 --- a/build/linux.gcc.inc +++ b/build/linux.gcc.inc @@ -32,12 +32,12 @@ DYLIB_KEY = -shared diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch index 9c66c132fff..f4af5de9e50 100644 --- a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch +++ b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch @@ -1,5 +1,3 @@ -diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc -index dc22ca3..65dfb6e 100644 --- a/build/FreeBSD.gcc.inc +++ b/build/FreeBSD.gcc.inc @@ -28,8 +28,8 @@ WARNING_KEY = -Wall @@ -46,8 +44,6 @@ index dc22ca3..65dfb6e 100644 TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o endif -diff --git a/build/linux.clang.inc b/build/linux.clang.inc -index fc8d7de..21ad5d4 100644 --- a/build/linux.clang.inc +++ b/build/linux.clang.inc @@ -31,15 +31,15 @@ DYLIB_KEY = -shared @@ -107,8 +103,6 @@ index fc8d7de..21ad5d4 100644 ifeq ($(cfg),debug) ASM_FLAGS += -g endif -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index f9b483d..1e69789 100644 --- a/build/linux.gcc.inc +++ b/build/linux.gcc.inc @@ -32,12 +32,12 @@ DYLIB_KEY = -shared diff --git a/dev-cpp/tbb/tbb-2017.20161128.ebuild b/dev-cpp/tbb/tbb-2017.20161128.ebuild index f88fe955918..42598e74ad8 100644 --- a/dev-cpp/tbb/tbb-2017.20161128.ebuild +++ b/dev-cpp/tbb/tbb-2017.20161128.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,8 +22,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MYP}" PATCHES=( - "${FILESDIR}"/${P}-underlinking.patch - "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch + "${FILESDIR}"/${PN}-2017.20161128-build.patch ) src_prepare() { diff --git a/dev-cpp/tbb/tbb-4.4.20160803.ebuild b/dev-cpp/tbb/tbb-4.4.20160803.ebuild index c05b5cccc88..fb62b61be4a 100644 --- a/dev-cpp/tbb/tbb-4.4.20160803.ebuild +++ b/dev-cpp/tbb/tbb-4.4.20160803.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,8 +23,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MYP}" PATCHES=( - "${FILESDIR}"/${P}-underlinking.patch - "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch + "${FILESDIR}"/${PN}-4.4.20160803-build.patch ) src_prepare() {
