diff options
| author | ryoon <ryoon@pkgsrc.org> | 2017-09-30 04:38:09 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2017-09-30 04:38:09 +0000 |
| commit | e7ca10f3512f59ee6a2f99bc1acd9e819fd11f4e (patch) | |
| tree | 0c44d0a961875e1225473ac974a4082c26ee1278 /lang | |
| parent | b8c681c6248bfa5595c3d1b81ba0a03abc57132c (diff) | |
| download | pkgsrc-e7ca10f3512f59ee6a2f99bc1acd9e819fd11f4e.tar.gz | |
Do not return -ltinfo from llvm-config --system-libs --link-static
under NetBSD. Bump PKGREVISION
Rust language 1.20.0 uses these options and Rust build system uses it
as '-l tinfo' and our wrapper does not handle this.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/llvm/Makefile | 3 | ||||
| -rw-r--r-- | lang/llvm/distinfo | 3 | ||||
| -rw-r--r-- | lang/llvm/patches/patch-cmake_config-ix.cmake | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile index 40483c0267f..8fedcf852af 100644 --- a/lang/llvm/Makefile +++ b/lang/llvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2017/07/11 19:47:37 adam Exp $ +# $NetBSD: Makefile,v 1.25 2017/09/30 04:38:09 ryoon Exp $ # # when updating this, please also update: # devel/include-what-you-use @@ -14,6 +14,7 @@ DISTNAME= llvm-4.0.1.src PKGNAME= ${DISTNAME:S/.src//} +PKGREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz diff --git a/lang/llvm/distinfo b/lang/llvm/distinfo index df8cefdf74d..4d919ede6b3 100644 --- a/lang/llvm/distinfo +++ b/lang/llvm/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.9 2017/07/11 19:47:37 adam Exp $ +$NetBSD: distinfo,v 1.10 2017/09/30 04:38:09 ryoon Exp $ SHA1 (llvm-4.0.1.src.tar.xz) = ddbf4dab7ab1a4bdce5ed1227bf721cbb3533a6e RMD160 (llvm-4.0.1.src.tar.xz) = 37387a5ca73ea270b2f541ecbd1cd641f7b09be2 SHA512 (llvm-4.0.1.src.tar.xz) = 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d Size (llvm-4.0.1.src.tar.xz) = 21065652 bytes +SHA1 (patch-cmake_config-ix.cmake) = ae7fdf297485b8e944f92dceed0da2c835c43c72 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4bfb98c5d99797155d0fb13a43352d31f6cfe783 SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b SHA1 (patch-include_llvm_Support_Host.h) = a4e19a72714084b211b0182c04ccc51bd606e150 diff --git a/lang/llvm/patches/patch-cmake_config-ix.cmake b/lang/llvm/patches/patch-cmake_config-ix.cmake new file mode 100644 index 00000000000..9bac698c1fa --- /dev/null +++ b/lang/llvm/patches/patch-cmake_config-ix.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-cmake_config-ix.cmake,v 1.1 2017/09/30 04:38:09 ryoon Exp $ + +* Do not generate invalid llvm-config in pkgsrc + +--- cmake/config-ix.cmake.orig 2017-05-19 01:55:05.000000000 +0000 ++++ cmake/config-ix.cmake +@@ -135,7 +135,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SA + endif() + if(LLVM_ENABLE_TERMINFO) + set(HAVE_TERMINFO 0) +- foreach(library tinfo terminfo curses ncurses ncursesw) ++ foreach(library terminfo tinfo curses ncurses ncursesw) + string(TOUPPER ${library} library_suffix) + check_library_exists(${library} setupterm "" HAVE_TERMINFO_${library_suffix}) + if(HAVE_TERMINFO_${library_suffix}) |