pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/llvm Do not return -ltinfo from llvm-config --sys...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/54ee7afaa6ee
branches:  trunk
changeset: 369489:54ee7afaa6ee
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Sep 30 04:38:09 2017 +0000

description:
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:

 lang/llvm/Makefile                            |   3 ++-
 lang/llvm/distinfo                            |   3 ++-
 lang/llvm/patches/patch-cmake_config-ix.cmake |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 74c7534629a6 -r 54ee7afaa6ee lang/llvm/Makefile
--- a/lang/llvm/Makefile        Fri Sep 29 22:21:13 2017 +0000
+++ b/lang/llvm/Makefile        Sat Sep 30 04:38:09 2017 +0000
@@ -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 -r 74c7534629a6 -r 54ee7afaa6ee lang/llvm/distinfo
--- a/lang/llvm/distinfo        Fri Sep 29 22:21:13 2017 +0000
+++ b/lang/llvm/distinfo        Sat Sep 30 04:38:09 2017 +0000
@@ -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 -r 74c7534629a6 -r 54ee7afaa6ee lang/llvm/patches/patch-cmake_config-ix.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/llvm/patches/patch-cmake_config-ix.cmake     Sat Sep 30 04:38:09 2017 +0000
@@ -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})



Home | Main Index | Thread Index | Old Index