pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang Clean up definition of libtool on Darwin.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/67280906a83e
branches:  trunk
changeset: 357245:67280906a83e
user:      brook <brook%pkgsrc.org@localhost>
date:      Mon Jan 16 21:56:35 2017 +0000

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

diffstat:

 lang/libLLVM/Makefile |  6 +-----
 lang/llvm/Makefile    |  3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 9bdd57e6f4a2 -r 67280906a83e lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Mon Jan 16 20:43:30 2017 +0000
+++ b/lang/libLLVM/Makefile     Mon Jan 16 21:56:35 2017 +0000
@@ -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 @@
 
 .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}
diff -r 9bdd57e6f4a2 -r 67280906a83e lang/llvm/Makefile
--- a/lang/llvm/Makefile        Mon Jan 16 20:43:30 2017 +0000
+++ b/lang/llvm/Makefile        Mon Jan 16 21:56:35 2017 +0000
@@ -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 @@
 .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:



Home | Main Index | Thread Index | Old Index