CVS commit: pkgsrc/lang

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Mon Jan 16 21:56:35 UTC 2017

Modified Files:
        pkgsrc/lang/libLLVM: Makefile
        pkgsrc/lang/llvm: Makefile

Log Message:
Clean up definition of libtool on Darwin.

The previous commit ended up with two different specifications for libtool
on Darwin.  One was the OS-specific version of CMAKE_ARGS introduced in the
previous commit; the other was inside a conditional to detect Darwin introduced in the commit prior.  The former seems cleaner so it has been left.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/llvm/Makefile

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

Modified files:

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.17 pkgsrc/lang/libLLVM/Makefile:1.18
--- pkgsrc/lang/libLLVM/Makefile:1.17   Mon Jan 16 17:26:47 2017
+++ pkgsrc/lang/libLLVM/Makefile        Mon Jan 16 21:56:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/01/16 17:26:47 brook Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/16 21:56:35 brook Exp $
 
 DISTNAME=      llvm-3.9.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -90,10 +90,6 @@ TEST_ENV+=           LD_LIBRARY_PATH=${WRKDIR}/bu
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+=   -DCMAKE_LIBTOOL=/usr/bin/libtool
-.endif
-
 # 3.8.0 -> 3.8
 LLVM_MAJOR_MINOR=      ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 PLIST_SUBST+=          LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR}

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.13 pkgsrc/lang/llvm/Makefile:1.14
--- pkgsrc/lang/llvm/Makefile:1.13      Mon Jan 16 17:26:47 2017
+++ pkgsrc/lang/llvm/Makefile   Mon Jan 16 21:56:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/01/16 17:26:47 brook Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/16 21:56:35 brook Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -99,7 +99,6 @@ CXXFLAGS+=    -march=i586
 .endif
 
 .if ${OPSYS} == "Darwin"
-CMAKE_ARGS+=   -DCMAKE_LIBTOOL=/usr/bin/libtool
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name: