svn commit: r536470 - in head/devel/tbb: . files

[Ganael LAPLANCHE]

Author: martymac
Date: Mon May 25 14:17:07 2020
New Revision: 536470
URL: https://svnweb.freebsd.org/changeset/ports/536470

Log:
  Add powerpc support
  
  PR:		246718
  Submitted by:	pkubaj

Modified:
  head/devel/tbb/Makefile
  head/devel/tbb/files/patch-build-BSD.inc
  head/devel/tbb/files/patch-build_FreeBSD.gcc.inc

Modified: head/devel/tbb/Makefile
==============================================================================
--- head/devel/tbb/Makefile	Mon May 25 14:15:57 2020	(r536469)
+++ head/devel/tbb/Makefile	Mon May 25 14:17:07 2020	(r536470)
@@ -11,7 +11,7 @@ COMMENT=	Library that provides thread building blocks
 
 LICENSE=	APACHE20
 
-ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc64
+ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc powerpc64
 ONLY_FOR_ARCHS_REASON=	has not been ported to this platform
 
 USES=	compiler gmake tar:tgz

Modified: head/devel/tbb/files/patch-build-BSD.inc
==============================================================================
--- head/devel/tbb/files/patch-build-BSD.inc	Mon May 25 14:15:57 2020	(r536469)
+++ head/devel/tbb/files/patch-build-BSD.inc	Mon May 25 14:17:07 2020	(r536470)
@@ -1,6 +1,6 @@
---- build/BSD.inc.orig	2019-12-18 22:42:41 UTC
+--- build/BSD.inc.orig	2020-03-30 11:38:06 UTC
 +++ build/BSD.inc
-@@ -22,17 +22,26 @@ ifndef arch
+@@ -22,17 +22,29 @@ ifndef arch
          ifeq ($(shell uname -m),amd64)
                  export arch:=intel64
          endif
@@ -13,6 +13,9 @@
 +        ifeq ($(shell uname -p),powerpc64)
 +                export arch:=powerpc64
 +        endif
++        ifeq ($(shell uname -p),powerpc)
++                export arch:=powerpc
++        endif
  endif
  
  ifndef runtime
@@ -30,7 +33,7 @@
  debugger ?= gdb
  
  CMD=$(SHELL) -c
-@@ -42,7 +51,7 @@ RD?=rmdir
+@@ -42,7 +54,7 @@ RD?=rmdir
  MD?=mkdir -p
  NUL= /dev/null
  SLASH=/

Modified: head/devel/tbb/files/patch-build_FreeBSD.gcc.inc
==============================================================================
--- head/devel/tbb/files/patch-build_FreeBSD.gcc.inc	Mon May 25 14:15:57 2020	(r536469)
+++ head/devel/tbb/files/patch-build_FreeBSD.gcc.inc	Mon May 25 14:17:07 2020	(r536470)
@@ -1,4 +1,4 @@
---- build/FreeBSD.gcc.inc.orig	2019-12-20 22:46:13 UTC
+--- build/FreeBSD.gcc.inc.orig	2020-03-30 11:38:06 UTC
 +++ build/FreeBSD.gcc.inc
 @@ -26,7 +26,7 @@ WARNING_SUPPRESS = -Wno-parentheses
  
@@ -9,15 +9,20 @@
  LIBS = -lpthread 
  C_FLAGS = $(CPLUS_FLAGS)
  
-@@ -56,6 +56,11 @@ ifeq (ia64,$(arch))
- endif 
- 
+@@ -58,6 +58,16 @@ endif 
  ifeq (intel64,$(arch))
+     CPLUS_FLAGS += -m64
+     LIB_LINK_FLAGS += -m64
++endif 
++
++ifeq (powerpc64,$(arch))
 +    CPLUS_FLAGS += -m64
 +    LIB_LINK_FLAGS += -m64
 +endif 
 +
-+ifeq (powerpc64,$(arch))
-     CPLUS_FLAGS += -m64
-     LIB_LINK_FLAGS += -m64
++ifeq (powerpc,$(arch))
++    CPLUS_FLAGS += -m32
++    LIB_LINK_FLAGS += -m32
  endif 
+ 
+ ifeq (ia32,$(arch))