pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang Use the system-specific libtool on Darwin.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0959b9bd2fa
branches:  trunk
changeset: 357240:a0959b9bd2fa
user:      brook <brook%pkgsrc.org@localhost>
date:      Mon Jan 16 17:26:47 2017 +0000

description:
Use the system-specific libtool on Darwin.

This fixes bugs relating to unrecognized libtool options on Darwin.

diffstat:

 lang/clang/Makefile.common |  4 +++-
 lang/libLLVM/Makefile      |  4 +++-
 lang/llvm/Makefile         |  4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r fe34b8101c21 -r a0959b9bd2fa lang/clang/Makefile.common
--- a/lang/clang/Makefile.common        Mon Jan 16 14:35:49 2017 +0000
+++ b/lang/clang/Makefile.common        Mon Jan 16 17:26:47 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/01/16 17:26:47 brook Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
@@ -28,6 +28,8 @@
 # XXX can't disable static-analyzer without also disabling ARCMT
 CMAKE_ARGS+=   -DCLANG_ENABLE_ARCMT=OFF
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 REPLACE_PERL+=         test/make_test_dirs.pl
 REPLACE_PERL+=         tools/scan-build/bin/scan-build
 REPLACE_PERL+=         tools/scan-build/libexec/c++-analyzer
diff -r fe34b8101c21 -r a0959b9bd2fa lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Mon Jan 16 14:35:49 2017 +0000
+++ b/lang/libLLVM/Makefile     Mon Jan 16 17:26:47 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/16 17:26:47 brook Exp $
 
 DISTNAME=      llvm-3.9.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -25,6 +25,8 @@
 CMAKE_ARGS+=   -DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=   -DLLVM_INCLUDE_TESTS=OFF
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 .for tool in   bugpoint bugpoint_passes dsymutil llc lli llvm_ar       \
        llvm_as llvm_bcanalyzer llvm_c_test llvm_cov llvm_cxxdump       \
        llvm_diff llvm_dis llvm_dwarfdump llvm_dwp llvm_extract llvm_go \
diff -r fe34b8101c21 -r a0959b9bd2fa lang/llvm/Makefile
--- a/lang/llvm/Makefile        Mon Jan 16 14:35:49 2017 +0000
+++ b/lang/llvm/Makefile        Mon Jan 16 17:26:47 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/16 17:26:47 brook Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -33,6 +33,8 @@
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=g++
 CMAKE_ARGS+=   -DLLVM_INSTALL_UTILS=ON
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 CHECK_PORTABILITY_SKIP=        utils/buildit/build_llvm
 
 # XXX perl is not added as a tool as it does not seem to be required



Home | Main Index | Thread Index | Old Index