Wed Jan 23 15:41:38 2019 UTC ()
compiler-rt: Move OS_DIR to where clang expects it.

Bump PKGREVISION.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/lang/compiler-rt/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/lang/compiler-rt/Makefile (switch to unified diff)

--- pkgsrc/lang/compiler-rt/Makefile 2018/12/23 00:11:39 1.7
+++ pkgsrc/lang/compiler-rt/Makefile 2019/01/23 15:41:38 1.8
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1# $NetBSD: Makefile,v 1.7 2018/12/23 00:11:39 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2019/01/23 15:41:38 jperkin Exp $
2 2
3DISTNAME= compiler-rt-7.0.1.src 3DISTNAME= compiler-rt-7.0.1.src
 4PKGREVISION= 1
4PKGNAME= ${DISTNAME:S/.src//} 5PKGNAME= ${DISTNAME:S/.src//}
5CATEGORIES= lang devel 6CATEGORIES= lang devel
6MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://compiler-rt.llvm.org/ 11HOMEPAGE= http://compiler-rt.llvm.org/
11COMMENT= LLVM runtime libraries 12COMMENT= LLVM runtime libraries
12LICENSE= modified-bsd OR mit 13LICENSE= modified-bsd OR mit
13 14
14NOT_FOR_PLATFORM= NetBSD-[0-7].*-* 15NOT_FOR_PLATFORM= NetBSD-[0-7].*-*
15 16
16USE_CMAKE= yes 17USE_CMAKE= yes
17USE_LANGUAGES= c99 c++11 18USE_LANGUAGES= c99 c++11
18USE_TOOLS+= ggrep 19USE_TOOLS+= ggrep
19GCC_REQD+= 4.8 20GCC_REQD+= 4.8
20SSP_SUPPORTED= no 21SSP_SUPPORTED= no
21 22
22CONFIGURE_DIRS= ${WRKDIR}/build 23CONFIGURE_DIRS= ${WRKDIR}/build
23CMAKE_ARG_PATH= ${WRKSRC} 24CMAKE_ARG_PATH= ${WRKSRC}
24 25
25OS_DIR.SunOS-5.11= solaris2.11 26OS_DIR= ${OPSYS:tl}
26OS_DIR= ${OS_DIR.${OPSYS}-${OS_VERSION}} 
27 27
28CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 28CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
29CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 29CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
30CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 30CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
31CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q} 31CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
32CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR} 32CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR}
33CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV} 33CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
34CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} 34CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
35CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF 35CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
36 36
37PLIST_SUBST+= COMPILER_RT_OS_DIR=${OS_DIR} 37PLIST_SUBST+= COMPILER_RT_OS_DIR=${OS_DIR}
38PLIST_VARS+= asan 38PLIST_VARS+= asan
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42.if ${OPSYS} != "SunOS" 42.if ${OPSYS} != "SunOS"
43PLIST.asan= yes 43PLIST.asan= yes
44.endif 44.endif
45 45
46TEST_TARGET= check-compiler-rt 46TEST_TARGET= check-compiler-rt
47 47
48PYTHON_FOR_BUILD_ONLY= yes 48PYTHON_FOR_BUILD_ONLY= yes
49 49
50post-extract: 50post-extract:
51 ${MKDIR} ${WRKDIR}/build 51 ${MKDIR} ${WRKDIR}/build
52 52
53post-install: 53post-install:
54 cd ${DESTDIR}${PREFIX} && \ 54 cd ${DESTDIR}${PREFIX} && \
55 ${FIND} lib/clang/${PKGVERSION_NOREV} -type f -name '*.dylib' \ 55 ${FIND} lib/clang/${PKGVERSION_NOREV} -type f -name '*.dylib' \
56 -exec install_name_tool -id ${PREFIX}/{} {} \; 56 -exec install_name_tool -id ${PREFIX}/{} {} \;
57 57
58.include "../../devel/googletest/buildlink3.mk" 58.include "../../devel/googletest/buildlink3.mk"
59.include "../../lang/llvm/buildlink3.mk" 59.include "../../lang/llvm/buildlink3.mk"
60.include "../../lang/python/tool.mk" 60.include "../../lang/python/tool.mk"
61.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"