diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-09-20 12:01:52 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-09-20 12:01:52 +0200 |
commit | bb6ead9708a9825f32e7ea306d4460fa77aa2eb9 (patch) | |
tree | 637923cdc9a2ee829848f13efbdc609a4c5ee613 /dev-cpp/tbb/files | |
parent | media-libs/mutagen: Version Bump (diff) | |
download | gentoo-bb6ead9708a9825f32e7ea306d4460fa77aa2eb9.tar.gz gentoo-bb6ead9708a9825f32e7ea306d4460fa77aa2eb9.tar.bz2 gentoo-bb6ead9708a9825f32e7ea306d4460fa77aa2eb9.zip |
dev-cpp/tbb: Drop old
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'dev-cpp/tbb/files')
-rw-r--r-- | dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch | 16 | ||||
-rw-r--r-- | dev-cpp/tbb/files/tbb-4.3-build.patch | 185 |
2 files changed, 0 insertions, 201 deletions
diff --git a/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch deleted file mode 100644 index c50e051c3d38..000000000000 --- a/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up tbb40_20120408oss/include/tbb/tbb_machine.h\~ tbb40_20120408oss/include/tbb/tbb_machine.h ---- tbb40_20120408oss/include/tbb/tbb_machine.h~ 2012-04-20 09:21:57.000000000 +0200 -+++ tbb40_20120408oss/include/tbb/tbb_machine.h 2012-08-28 13:20:42.150456167 +0200 -@@ -373,8 +373,8 @@ void spin_wait_until_eq( const volatile - // - The operation assumes that the architecture consistently uses either little-endian or big-endian: - // it does not support mixed-endian or page-specific bi-endian architectures. - // This function is the only use of __TBB_BIG_ENDIAN. --#if (__TBB_BIG_ENDIAN!=-1) -- #if ( __TBB_USE_GENERIC_PART_WORD_CAS) -+#if ( __TBB_USE_GENERIC_PART_WORD_CAS) -+ #if (__TBB_BIG_ENDIAN==-1) - #error generic implementation of part-word CAS was explicitly disabled for this configuration - #endif - template<typename T> - -Diff finished. Tue Aug 28 13:20:58 2012 diff --git a/dev-cpp/tbb/files/tbb-4.3-build.patch b/dev-cpp/tbb/files/tbb-4.3-build.patch deleted file mode 100644 index a9119ef49212..000000000000 --- a/dev-cpp/tbb/files/tbb-4.3-build.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- a/build/linux.gcc.inc 2014-10-31 09:08:38.000000000 -0400 -+++ b/build/linux.gcc.inc 2015-06-08 19:22:49.855807841 -0400 -@@ -32,12 +32,12 @@ - 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 @@ - 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 @@ - - 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 @@ - CONLY = mpicc - 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 @@ - #------------------------------------------------------------------------------ - # 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 ---- a/build/FreeBSD.gcc.inc 2014-10-31 09:08:37.000000000 -0400 -+++ b/build/FreeBSD.gcc.inc 2015-06-08 19:24:51.385810060 -0400 -@@ -27,14 +27,14 @@ - WARNING_KEY = -Wall - DYLIB_KEY = -shared - --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 -@@ -51,22 +51,12 @@ - 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 2014-10-31 09:08:37.000000000 -0400 -+++ b/build/linux.clang.inc 2015-06-08 20:24:29.785875376 -0400 -@@ -31,15 +31,15 @@ - 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=. - 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 @@ - - 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 @@ - # 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 |