Attachment #184475 for bug #220829




# $FreeBSD: head/devel/flang/Makefile 444324 2017-06-25 21:07:58Z tcberner $

PORTNAME=	flang
DISTVERSION=	4.0-20170717
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	jmd@FreeBSD.org

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

BUILD_DEPENDS=	llvm40>=0:devel/llvm40 \
		openmp>=0:devel/openmp \
		flang-clang>=0:devel/flang-clang
RUN_DEPENDS=	llvm40>=0:devel/llvm40 \
		openmp>=0:devel/openmp \
		flang-clang>=0:devel/flang-clang



USE_GITHUB=	yes
GH_ACCOUNT=	flang-compiler
GH_TAGNAME=	cd44bcd

CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
		-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
		-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
		-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang

Lines 1-3 Link Here

(-)flang/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1495501996	1	TIMESTAMP = 1500383149
2	SHA256 (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = e0398ba2e01d14dbd23b6cd9f07b66c0072a23468a48490003bbb3dff49895e5	2	SHA256 (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 6d88a8a04fa3897c2d90d556a1018eaed607b7cdb9242fbf54f1282e2d25d6c9
3	SIZE (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = 3578945	3	SIZE (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 3582194




--- CMakeLists.txt.orig	2017-07-17 19:12:06 UTC
+++ CMakeLists.txt
@@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 2.8)
 SET(CMAKE_Fortran_COMPILER_WORKS 1)
 
 if( NOT DEFINED TARGET_ARCHITECTURE )
-  execute_process(COMMAND uname -i OUTPUT_STRIP_TRAILING_WHITESPACE
+  execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
                   OUTPUT_VARIABLE TARGET_ARCHITECTURE)
   execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
                   OUTPUT_VARIABLE TARGET_OS)
@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
     message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
     return()

Return to bug 220829

Lines 2-9 Link Here

(-)flang/Makefile (-6 / +5 lines)
2	# $FreeBSD: head/devel/flang/Makefile 444324 2017-06-25 21:07:58Z tcberner $	2	# $FreeBSD: head/devel/flang/Makefile 444324 2017-06-25 21:07:58Z tcberner $
3		3
4	PORTNAME= flang	4	PORTNAME= flang
5	DISTVERSION= 3.9-20170522	5	DISTVERSION= 4.0-20170717
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8		7
9	MAINTAINER= jmd@FreeBSD.org	8	MAINTAINER= jmd@FreeBSD.org
Lines 12-21 Link Here
12	LICENSE= APACHE20	11	LICENSE= APACHE20
13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	12	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
14		13
15	BUILD_DEPENDS= llvm39>=0:devel/llvm39 \	14	BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
16	openmp>=0:devel/openmp \	15	openmp>=0:devel/openmp \
17	flang-clang>=0:devel/flang-clang	16	flang-clang>=0:devel/flang-clang
18	RUN_DEPENDS= llvm39>=0:devel/llvm39 \	17	RUN_DEPENDS= llvm40>=0:devel/llvm40 \
19	openmp>=0:devel/openmp \	18	openmp>=0:devel/openmp \
20	flang-clang>=0:devel/flang-clang	19	flang-clang>=0:devel/flang-clang
21		20
Lines 33-41 Link Here
33		32
34	USE_GITHUB= yes	33	USE_GITHUB= yes
35	GH_ACCOUNT= flang-compiler	34	GH_ACCOUNT= flang-compiler
36	GH_TAGNAME= 5af07d4	35	GH_TAGNAME= cd44bcd
37		36
38	CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config39 \	37	CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
39	-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \	38	-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
40	-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \	39	-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
41	-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang	40	-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang

Lines 1-14 Link Here

(-)flang/files/patch-CMakeLists.txt (-10 / +1 lines)
1	--- CMakeLists.txt.orig 2017-05-17 00:40:01 UTC	1	--- CMakeLists.txt.orig 2017-07-17 19:12:06 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 2.8)
4	SET(CMAKE_Fortran_COMPILER_WORKS 1)
5
6	if( NOT DEFINED TARGET_ARCHITECTURE )
7	- execute_process(COMMAND uname -i OUTPUT_STRIP_TRAILING_WHITESPACE
8	+ execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
9	OUTPUT_VARIABLE TARGET_ARCHITECTURE)
10	execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
11	OUTPUT_VARIABLE TARGET_OS)
12	@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )	3	@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
13	message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )	4	message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
14	return()	5	return()