mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
dev-cpp/tbb: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12762 Signed-off-by: Aaron Bauman <bman@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user