pkgsrc-Users archive

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

Re: lang/compilers support for MacOS



> On Jan 13, 2017, at 1:10 AM, Jonathan Perkin <jperkin%joyent.com@localhost> wrote:
> 
> CMAKE_ARGS is in OPSYSVARS so there's no need to include bsd.prefs.mk
> and do the OPSYS check, you can simply use the single line:
> 
>  CMAKE_ARGS.Darwin+=	-DCMAKE_LIBTOOL=/usr/bin/libtool

Thanks a lot for reminding me about that.  The new patch is now obviously much simpler (see below).  Does this look good to commit?

Jonathan, I think you work a lot with pkgsrc on MacOS; is there a reason this is not the correct general fix?

Cheers,
Brook

Index: lang/clang/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/lang/clang/Makefile.common,v
retrieving revision 1.16
diff -u -r1.16 Makefile.common
--- lang/clang/Makefile.common	17 Dec 2016 23:28:34 -0000	1.16
+++ lang/clang/Makefile.common	14 Jan 2017 16:47:34 -0000
@@ -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
Index: lang/libLLVM/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/libLLVM/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- lang/libLLVM/Makefile	20 Dec 2016 22:40:06 -0000	1.15
+++ lang/libLLVM/Makefile	14 Jan 2017 16:47:35 -0000
@@ -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	\
Index: lang/llvm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/llvm/Makefile,v
retrieving revision 1.10.2.1
diff -u -r1.10.2.1 Makefile
--- lang/llvm/Makefile	2 Jan 2017 14:40:11 -0000	1.10.2.1
+++ lang/llvm/Makefile	14 Jan 2017 16:47:35 -0000
@@ -34,6 +34,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