summaryrefslogtreecommitdiff
path: root/dev-cpp/tbb
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-10 13:21:36 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-10 13:21:36 +0000
commit77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /dev-cpp/tbb
parentbd4aeefe33e63f613512604e47bfca7b2187697d (diff)
gentoo resync : 10.11.2019
Diffstat (limited to 'dev-cpp/tbb')
-rw-r--r--dev-cpp/tbb/Manifest3
-rw-r--r--dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch20
-rw-r--r--dev-cpp/tbb/files/tbb-4.3.20150611-build.patch185
-rw-r--r--dev-cpp/tbb/files/tbb-4.4.20160803-build.patch187
4 files changed, 0 insertions, 395 deletions
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index de17bfac7f39..fb3971d774a4 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,7 +1,4 @@
AUX tbb-2017.20161128-build.patch 4840 BLAKE2B eec4a437f0a609c8f39b76950aae76c9e357cd0705ad521a3304aceb8361c10cdf0d28078370c840ad315cbe06f3b134ca5d58036b2718a136f3958c3942e9c1 SHA512 40ca5bdfe05eecbc47a9af062e6ede3e14200048cdebd796af71cd5f27b350c65e5aa569cc8a6e2f3cfbd90fec167d4f053abc36310b07113910ba25061c56a4
-AUX tbb-4.0.297-underlinking.patch 479 BLAKE2B c4e0410c4651bb7db99494c6746eb43cd488e4f37c38bdbdf4ecf6ab7ece1e469393f6b4296fc41524dec931bdec72e97ed05e3ab8e685584a58519bb945bd61 SHA512 2e5e17d1547e809e035b148ef6d45f5db9902f535a2bc2283051f1cc29d43c32c15db7cdd048a50493a13ccf6b44a3538054e50a47fca080df535bed1768de85
-AUX tbb-4.3.20150611-build.patch 4806 BLAKE2B dd5f785a8c3d6d715c1573a14aaa3dda1216dc4c4a124b24b217e4e919675f2eb64488f8423acf3bd5d568d30bd011c8d107db0b5de2774e7439561da947f758 SHA512 82c8121e2214a02f0bbf647eb03486e5c7db3e180f834001c5ad7ac53791e876ddd63bef1af6ba2590d9673af6beb6b725138bbad8c3b61271b29b7eb72f41c0
-AUX tbb-4.4.20160803-build.patch 4838 BLAKE2B 3e410208ee260dc0839b3658e436d742b8c03eba5eb6f7c6b697bae75d0078a2099b1cf012f32b1a3486d87a2eba123fcad7e651c3ce63dc883491b2e7192af7 SHA512 cee8733f667fec20ea5760176bec587e4c0dfc9286841ccc6f72702a3440fe5ea4054b7e7c22c98d4d4814ef4bd160264962d3a4d58d177141c15cf391c5f30e
AUX tbb-4.4.20160803-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1
DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
deleted file mode 100644
index ed318cab8386..000000000000
--- a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu May 31 21:37:47 UTC 2012
-Subject: build system
-
-fix underlinking in test phase
-wrt https://bugs.gentoo.org/show_bug.cgi?id=418447
-
---- 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)
- LINK_TBB.LIB = $(PROXY.LIB)
-- LIBS += $(LIBDL)
--endif
-+endif
-+LIBS += $(LIBDL)
-
- include $(tbb_root)/build/common_rules.inc
-
diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
deleted file mode 100644
index 8f806989e443..000000000000
--- a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- a/build/FreeBSD.gcc.inc
-+++ b/build/FreeBSD.gcc.inc
-@@ -28,14 +28,14 @@ WARNING_KEY = -Wall
- DYLIB_KEY = -shared
- WARNING_SUPPRESS = -Wno-parentheses
-
--CPLUS = g++
--CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
- LIB_LINK_FLAGS = -shared
- LIBS = -lpthread
- C_FLAGS = $(CPLUS_FLAGS)
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
-@@ -52,22 +52,12 @@ ifeq (ia64,$(arch))
- CPLUS_FLAGS += $(PIC_KEY)
- endif
-
--ifeq (intel64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ia32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
--endif
--
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASSEMBLY_SOURCE=$(arch)-gas
- ifeq (ia64,$(arch))
-- ASM=as
-+ ASM=$(AS)
- 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
---- a/build/linux.clang.inc
-+++ b/build/linux.clang.inc
-@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
-
--CPLUS = clang++
--CONLY = clang
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
- C_FLAGS = $(CPLUS_FLAGS)
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -61,24 +61,10 @@ MALLOC_ASM.OBJ=
-
- ifeq (intel64,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
- endif
-
- ifeq (ia32,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m32 -march=pentium4
-- LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
- endif
-
- ifeq (bg,$(arch))
-@@ -90,12 +76,6 @@ endif
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASM = as
--ifeq (intel64,$(arch))
-- ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
-- ASM_FLAGS += --32
--endif
- ifeq ($(cfg),debug)
- ASM_FLAGS += -g
- endif
---- a/build/linux.gcc.inc
-+++ b/build/linux.gcc.inc
-@@ -32,12 +32,12 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
-
--CPLUS = g++
--CONLY = gcc
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
--C_FLAGS = $(CPLUS_FLAGS)
-+C_FLAGS := $(CPLUS_FLAGS)
- # gcc 4.4 and higher support -std=c++0x
- ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[4-9]|[5-9])"))
- CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
-@@ -54,7 +54,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^4\.[8-9]"))
- endif
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -74,24 +74,12 @@ endif
-
- ifeq (intel64,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m64 $(RTM_KEY)
-- LIB_LINK_FLAGS += -m64
-+ CPLUS_FLAGS += $(RTM_KEY)
- endif
-
- ifeq (ia32,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
-- LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
-+ CPLUS_FLAGS += $(RTM_KEY)
- endif
-
- ifeq (bg,$(arch))
-@@ -99,12 +87,6 @@ ifeq (bg,$(arch))
- CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
- endif
-
--# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
--ifeq (sparc,$(arch))
-- CPLUS_FLAGS += -mcpu=v9 -m64
-- LIB_LINK_FLAGS += -mcpu=v9 -m64
--endif
--
- # automatically generate "IT" instructions when compiling for Thumb ISA
- ifeq (armv7,$(arch))
- CPLUS_FLAGS += -Wa,-mimplicit-it=thumb
-@@ -113,13 +95,7 @@ endif
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
--ASM = as
--ifeq (intel64,$(arch))
-- ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
-- ASM_FLAGS += --32
--endif
-+ASM := $(AS)
- ifeq ($(cfg),debug)
- ASM_FLAGS += -g
- endif
diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
deleted file mode 100644
index f4af5de9e50d..000000000000
--- a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- a/build/FreeBSD.gcc.inc
-+++ b/build/FreeBSD.gcc.inc
-@@ -28,8 +28,8 @@ WARNING_KEY = -Wall
- DYLIB_KEY = -shared
- WARNING_SUPPRESS = -Wno-parentheses
-
--CPLUS = g++
--CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
- LIB_LINK_FLAGS = -shared
- LIBS = -lpthread
- C_FLAGS = $(CPLUS_FLAGS)
-@@ -42,7 +42,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])"))
- endif
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
-@@ -59,22 +59,12 @@ ifeq (ia64,$(arch))
- CPLUS_FLAGS += $(PIC_KEY)
- endif
-
--ifeq (intel64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ia32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
--endif
--
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASSEMBLY_SOURCE=$(arch)-gas
- ifeq (ia64,$(arch))
-- ASM=as
-+ ASM=$(AS)
- 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
---- a/build/linux.clang.inc
-+++ b/build/linux.clang.inc
-@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
-
--CPLUS = clang++
--CONLY = clang
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
- C_FLAGS = $(CPLUS_FLAGS)
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -55,24 +55,10 @@ MALLOC_ASM.OBJ=
-
- ifeq (intel64,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
- endif
-
- ifeq (ia32,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m32 -march=pentium4
-- LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
- endif
-
- ifeq (bg,$(arch))
-@@ -84,12 +70,6 @@ endif
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASM = as
--ifeq (intel64,$(arch))
-- ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
-- ASM_FLAGS += --32
--endif
- ifeq ($(cfg),debug)
- ASM_FLAGS += -g
- endif
---- a/build/linux.gcc.inc
-+++ b/build/linux.gcc.inc
-@@ -32,12 +32,12 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
-
--CPLUS = g++
--CONLY = gcc
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
--C_FLAGS = $(CPLUS_FLAGS)
-+C_FLAGS := $(CPLUS_FLAGS)
-
- # gcc 4.2 and higher support OpenMP
- ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[2-9]|[5-9])"))
-@@ -57,7 +57,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])"))
- endif
-
- ifeq ($(cfg), release)
-- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -73,24 +73,12 @@ endif
-
- ifeq (intel64,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m64 $(RTM_KEY)
-- LIB_LINK_FLAGS += -m64
-+ CPLUS_FLAGS += $(RTM_KEY)
- endif
-
- ifeq (ia32,$(arch))
- ITT_NOTIFY = -DDO_ITT_NOTIFY
-- CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
-- LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
-- CPLUS_FLAGS += -m64
-- LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
-- CPLUS_FLAGS += -m32
-- LIB_LINK_FLAGS += -m32
-+ CPLUS_FLAGS += $(RTM_KEY)
- endif
-
- ifeq (bg,$(arch))
-@@ -98,12 +86,6 @@ ifeq (bg,$(arch))
- CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
- endif
-
--# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
--ifeq (sparc,$(arch))
-- CPLUS_FLAGS += -mcpu=v9 -m64
-- LIB_LINK_FLAGS += -mcpu=v9 -m64
--endif
--
- # automatically generate "IT" instructions when compiling for Thumb ISA
- ifeq (armv7,$(arch))
- CPLUS_FLAGS += -Wa,-mimplicit-it=thumb
-@@ -112,13 +94,7 @@ endif
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
--ASM = as
--ifeq (intel64,$(arch))
-- ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
-- ASM_FLAGS += --32
--endif
-+ASM := $(AS)
- ifeq ($(cfg),debug)
- ASM_FLAGS += -g
- endif