diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-cpp/tbb/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-cpp/tbb/files')
-rw-r--r-- | dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch | 20 | ||||
-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 | ||||
-rw-r--r-- | dev-cpp/tbb/files/tbb-4.3.20150611-build.patch | 196 |
4 files changed, 417 insertions, 0 deletions
diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch new file mode 100644 index 000000000000..099bb39d2143 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch @@ -0,0 +1,20 @@ +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 + +--- build/Makefile.test ++++ 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.1.20121003-ppc.patch b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch new file mode 100644 index 000000000000..c50e051c3d38 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000000..a9119ef49212 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-4.3-build.patch @@ -0,0 +1,185 @@ +--- 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 diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch new file mode 100644 index 000000000000..42a8bae4640a --- /dev/null +++ b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch @@ -0,0 +1,196 @@ + 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 + 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 +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 + 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 +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 + 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 |