cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the latest flang--this brings us in line with Nvidia's latest

Browse Source 
binary release. Note the minor bump to libflang and the major bump to
libflangrti.
This commit is contained in:
bcallah 2018-09-26 18:31:46 +00:00
parent 83d6481021
commit e5f141e8cf
10 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/flang/driver/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2018/08/26 00:40:22 bcallah Exp $
# $OpenBSD: Makefile,v 1.10 2018/09/26 18:31:46 bcallah Exp $
# If you are updating to a new version
# (e.g. 6.0->6.1 or 7.0), you need to sync
# patches with devel/llvm
COMMENT = LLVM Fortran compiler driver
DISTNAME = flang-driver-6.0.0.20180824
DISTNAME = flang-driver-6.0.0.20180906
GH_PROJECT = flang-driver
GH_COMMIT = 742de5f3f7059c9397beb33f806f6b29c012a60e
GH_COMMIT = dd7587310ae498c22514a33e1a2546b86af9cf25
WANTLIB += ${COMPILER_LIBCXX} c m z

4
lang/flang/driver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (flang-driver-6.0.0.20180824-742de5f3.tar.gz) = cYx+ZarfgmodltZBp1vaqVzGTpmTYkIv+dHPV5LTqhw=
SIZE (flang-driver-6.0.0.20180824-742de5f3.tar.gz) = 16787370
SHA256 (flang-driver-6.0.0.20180906-dd758731.tar.gz) = jYLnTlwIVCXJPtJDHYe2BZ4M4ccDrfPSQI+tMpBpVJw=
SIZE (flang-driver-6.0.0.20180906-dd758731.tar.gz) = 16785509

12
lang/flang/flang/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.27 2018/08/31 21:50:08 bcallah Exp $
# $OpenBSD: Makefile,v 1.28 2018/09/26 18:31:46 bcallah Exp $
COMMENT = LLVM Fortran compiler passes and runtime library
DISTNAME = flang-6.0.0.20180830
DISTNAME = flang-6.0.0.20180921
SHARED_LIBS += flang 1.3 # 6.0
SHARED_LIBS += flangrti 2.0 # 6.0
SHARED_LIBS += flang 1.4 # 6.0
SHARED_LIBS += flangrti 3.0 # 6.0
SHARED_LIBS += ompstub 0.0 # 6.0
GH_PROJECT = flang
GH_COMMIT = c04c6ca4c803a8daaffaf254a277c8cc4d7407a5
GH_COMMIT = 498be068d81465f7483bf8ad92713a23cc49dd17
WANTLIB += aio_compat c execinfo m pgmath pthread
WANTLIB += ${COMPILER_LIBCXX} aio_compat c execinfo m pgmath
# C11
COMPILER = base-clang ports-gcc ports-clang

4
lang/flang/flang/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (flang-6.0.0.20180830-c04c6ca4.tar.gz) = OeRBfzlPubgVo95M+fF1O7Nmf6prwH6qWqutd63co8I=
SIZE (flang-6.0.0.20180830-c04c6ca4.tar.gz) = 4606991
SHA256 (flang-6.0.0.20180921-498be068.tar.gz) = 2nEdiGX+qmaUGgfkI4DDl31yLmioEHD/jkE0YaU7ADg=
SIZE (flang-6.0.0.20180921-498be068.tar.gz) = 4613918

8
lang/flang/flang/patches/patch-runtime_flang_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-runtime_flang_CMakeLists_txt,v 1.5 2018/07/04 22:00:28 bcallah Exp $
$OpenBSD: patch-runtime_flang_CMakeLists_txt,v 1.6 2018/09/26 18:31:46 bcallah Exp $
Replace -lrt with -laio_compat
Appease lld
@ -16,7 +16,7 @@ Index: runtime/flang/CMakeLists.txt
# We are using Fortran driver to build this library with fresh compiler
# components, so point its binary directory to the build directory to pick up
@@ -420,7 +420,7 @@ set(I8_FILES_DIR I8_sources)
@@ -419,7 +419,7 @@ set(I8_FILES_DIR I8_sources)
# Fortran files with macros as module names need to be preprocessed.
add_custom_command(
OUTPUT "${I8_FILES_DIR}/ieee_arithmetic.F95"
@ -25,7 +25,7 @@ Index: runtime/flang/CMakeLists.txt
"${CMAKE_CURRENT_SOURCE_DIR}/ieee_arithmetic.F95" -DDESC_I8
> "${I8_FILES_DIR}/ieee_arithmetic.F95"
COMMENT "Preprocessing ieee_arithmetic.F95"
@@ -429,7 +429,7 @@ add_custom_command(
@@ -428,7 +428,7 @@ add_custom_command(
add_custom_command(
OUTPUT "${I8_FILES_DIR}/ieee_exceptions.F95"
@ -34,7 +34,7 @@ Index: runtime/flang/CMakeLists.txt
"${CMAKE_CURRENT_SOURCE_DIR}/ieee_exceptions.F95" -DDESC_I8
> "${I8_FILES_DIR}/ieee_exceptions.F95"
COMMENT "Preprocessing ieee_exceptions.F95"
@@ -479,7 +479,7 @@ add_flang_library(flang_shared
@@ -478,7 +478,7 @@ add_flang_library(flang_shared
set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
# Resolve symbols against libm and librt

4
lang/flang/flang/patches/patch-runtime_flangrti_CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-runtime_flangrti_CMakeLists_txt,v 1.4 2018/08/31 21:50:08 bcallah Exp $
$OpenBSD: patch-runtime_flangrti_CMakeLists_txt,v 1.5 2018/09/26 18:31:46 bcallah Exp $
We need -lexecinfo. Use the static version for ease.
Index: runtime/flangrti/CMakeLists.txt
--- runtime/flangrti/CMakeLists.txt.orig
+++ runtime/flangrti/CMakeLists.txt
@@ -109,6 +109,9 @@ find_library(
@@ -108,6 +108,9 @@ find_library(
HINTS ${CMAKE_BINARY_DIR}/lib)
target_link_libraries(flangrti_shared ${LIBPGMATH})

16
lang/flang/flang/patches/patch-runtime_flangrti_mpmalloc_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-runtime_flangrti_mpmalloc_c,v 1.1 2018/09/26 18:31:46 bcallah Exp $
We don't have this include.
Index: runtime/flangrti/mpmalloc.c
--- runtime/flangrti/mpmalloc.c.orig
+++ runtime/flangrti/mpmalloc.c
@@ -17,7 +17,7 @@
/* mp-safe wrappers for malloc, etc. */
-#ifdef TARGET_LINUX
+#if defined(TARGET_LINUX) && !defined(__OpenBSD__)
#include <features.h>
#endif

4
lang/flang/flang/patches/patch-tools_flang2_flang2exe_CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-tools_flang2_flang2exe_CMakeLists_txt,v 1.1 2018/06/27 00:09:26 bcallah Exp $
$OpenBSD: patch-tools_flang2_flang2exe_CMakeLists_txt,v 1.2 2018/09/26 18:31:46 bcallah Exp $
Eliminate the need for a post-patch copy.
Index: tools/flang2/flang2exe/CMakeLists.txt
--- tools/flang2/flang2exe/CMakeLists.txt.orig
+++ tools/flang2/flang2exe/CMakeLists.txt
@@ -101,7 +101,7 @@ set(INCLUDE_DIRS
@@ -97,7 +97,7 @@ set(INCLUDE_DIRS
${FLANG_SOURCE_DIR}/lib/scutil
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}

6
lang/flang/libpgmath/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.15 2018/08/31 21:50:08 bcallah Exp $
# $OpenBSD: Makefile,v 1.16 2018/09/26 18:31:46 bcallah Exp $
# Sync version with lang/flang/flang always!
COMMENT = LLVM Fortran math library
DISTNAME = flang-6.0.0.20180830
DISTNAME = flang-6.0.0.20180921
PKGNAME = ${DISTNAME:S/flang/libpgmath/}
SHARED_LIBS += pgmath 2.0 # 6.0
GH_PROJECT = flang
GH_COMMIT = c04c6ca4c803a8daaffaf254a277c8cc4d7407a5
GH_COMMIT = 498be068d81465f7483bf8ad92713a23cc49dd17
WANTLIB += ${COMPILER_LIBCXX} m

4
lang/flang/libpgmath/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (flang-6.0.0.20180830-c04c6ca4.tar.gz) = OeRBfzlPubgVo95M+fF1O7Nmf6prwH6qWqutd63co8I=
SIZE (flang-6.0.0.20180830-c04c6ca4.tar.gz) = 4606991
SHA256 (flang-6.0.0.20180921-498be068.tar.gz) = 2nEdiGX+qmaUGgfkI4DDl31yLmioEHD/jkE0YaU7ADg=
SIZE (flang-6.0.0.20180921-498be068.tar.gz) = 4613918