CVS commit: pkgsrc/lang/llvm

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Mar 31 15:13:28 UTC 2018

Modified Files:
        pkgsrc/lang/llvm: Makefile distinfo
Added Files:
        pkgsrc/lang/llvm/patches: patch-cmake_modules_CheckAtomic.cmake

Log Message:
Omit check for native 8-byte atomics, platform may not have them,
and they are actually not required here.  Makes powerpc build llvm.
OK'ed by joerg@.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/llvm/patches/patch-cmake_modules_CheckAtomic.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.29 pkgsrc/lang/llvm/Makefile:1.30
--- pkgsrc/lang/llvm/Makefile:1.29      Sun Mar  4 01:49:21 2018
+++ pkgsrc/lang/llvm/Makefile   Sat Mar 31 15:13:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/03/04 01:49:21 gdt Exp $
+# $NetBSD: Makefile,v 1.30 2018/03/31 15:13:28 he Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -18,7 +18,7 @@
 
 DISTNAME=      llvm-5.0.1.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.13 pkgsrc/lang/llvm/distinfo:1.14
--- pkgsrc/lang/llvm/distinfo:1.13      Mon Jan  8 10:48:34 2018
+++ pkgsrc/lang/llvm/distinfo   Sat Mar 31 15:13:28 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2018/01/08 10:48:34 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2018/03/31 15:13:28 he Exp $
 
 SHA1 (llvm-5.0.1.src.tar.xz) = 43d3659f8a3cef43e7435a3a874b0711f5888052
 RMD160 (llvm-5.0.1.src.tar.xz) = 3d17de87813313b6eac5b5dc8592f676c5cee561
@@ -7,6 +7,7 @@ Size (llvm-5.0.1.src.tar.xz) = 23428720 
 SHA1 (patch-CMakeLists.txt) = 78e2dab2bf73f7e466ca2788fe6444e39b4ebd80
 SHA1 (patch-cmake_config-ix.cmake) = 4675b1dfca3850dbed6c494bf6a8f6fc6d500c20
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4bfb98c5d99797155d0fb13a43352d31f6cfe783
+SHA1 (patch-cmake_modules_CheckAtomic.cmake) = 51e4fdf3bc24b50fc4d4bfa1ec5ba6c82ef946b4
 SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b
 SHA1 (patch-include_llvm_Support_DataTypes.h.cmake) = 18ebb1fcd2499d1216d5c3afe0bbb55fe63fe3ef
 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 70d8f320f217d99e6f991709a080450bc05631cd

Added files:

Index: pkgsrc/lang/llvm/patches/patch-cmake_modules_CheckAtomic.cmake
diff -u /dev/null pkgsrc/lang/llvm/patches/patch-cmake_modules_CheckAtomic.cmake:1.1
--- /dev/null   Sat Mar 31 15:13:28 2018
+++ pkgsrc/lang/llvm/patches/patch-cmake_modules_CheckAtomic.cmake      Sat Mar 31 15:13:28 2018
@@ -0,0 +1,38 @@
+$NetBSD: patch-cmake_modules_CheckAtomic.cmake,v 1.1 2018/03/31 15:13:28 he Exp $
+
+Omit check for native 8-byte atomics, platform may not have them,
+and they are actually not required here.  Makes powerpc build llvm.
+
+--- cmake/modules/CheckAtomic.cmake.orig       2016-06-23 06:39:35.000000000 +0000
++++ cmake/modules/CheckAtomic.cmake
+@@ -62,18 +62,18 @@ else()
+ endif()
+ 
+ # If not, check if the library exists, and atomics work with it.
+-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-  check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
+-  if(HAVE_CXX_LIBATOMICS64)
+-    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+-    check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
+-    if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
+-      message(FATAL_ERROR "Host compiler must support std::atomic!")
+-    endif()
+-  else()
+-    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
+-  endif()
+-endif()
++#if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
++#  check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
++#  if(HAVE_CXX_LIBATOMICS64)
++#    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++#    check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
++#    if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
++#      message(FATAL_ERROR "Host compiler must support std::atomic!")
++#    endif()
++#  else()
++#    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
++#  endif()
++#endif()
+ 
+ ## TODO: This define is only used for the legacy atomic operations in
+ ## llvm's Atomic.h, which should be replaced.  Other code simply