Wed Mar 4 13:57:42 2015 UTC ()
Makefile: move some stuff from Makefile.common here
PLIST: unsubstitute ${MACHINE_ARCH}


(tnn)
diff -r1.37 -r1.38 pkgsrc/lang/clang/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/clang/Makefile.common
diff -r1.15 -r1.16 pkgsrc/lang/clang/PLIST
cvs diff -r1.37 -r1.38 pkgsrc/lang/clang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile 2015/03/04 09:59:57 1.37
+++ pkgsrc/lang/clang/Makefile 2015/03/04 13:57:42 1.38
@@ -1,4 +1,8 @@ @@ -1,4 +1,8 @@
1# $NetBSD: Makefile,v 1.37 2015/03/04 09:59:57 tnn Exp $ 1# $NetBSD: Makefile,v 1.38 2015/03/04 13:57:42 tnn Exp $
 2
 3MAKE_DIRS= etc/llvm
 4INSTALLATION_DIRS= bin lib libexec
2 5
3.include "../../lang/clang/options.mk" 6.include "../../lang/clang/options.mk"
 7.include "../../textproc/libxml2/buildlink3.mk"
4.include "../../lang/clang/Makefile.common" 8.include "../../lang/clang/Makefile.common"
cvs diff -r1.1 -r1.2 pkgsrc/lang/clang/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile.common 2015/03/04 09:59:57 1.1
+++ pkgsrc/lang/clang/Makefile.common 2015/03/04 13:57:42 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.1 2015/03/04 09:59:57 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.2 2015/03/04 13:57:42 tnn Exp $
2# 2#
3# used by lang/clang/Makefile 3# used by lang/clang/Makefile
4# used by lang/libLLVM/Makefile 4# used by lang/libLLVM/Makefile
5 5
6DISTNAME= clang-3.6.0 6DISTNAME= clang-3.6.0
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ 8MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/
9DISTFILES= llvm-${PKGVERSION_NOREV}.src.tar.xz \ 9DISTFILES= llvm-${PKGVERSION_NOREV}.src.tar.xz \
10 libcxx-${PKGVERSION_NOREV}.src.tar.xz \ 10 libcxx-${PKGVERSION_NOREV}.src.tar.xz \
11 cfe-${PKGVERSION_NOREV}.src.tar.xz \ 11 cfe-${PKGVERSION_NOREV}.src.tar.xz \
12 compiler-rt-${PKGVERSION_NOREV}.src.tar.xz 12 compiler-rt-${PKGVERSION_NOREV}.src.tar.xz
13 13
14MAINTAINER= adam.hoka@gmail.com 14MAINTAINER= adam.hoka@gmail.com
@@ -17,30 +17,26 @@ COMMENT= Low Level Virtual Machine compi @@ -17,30 +17,26 @@ COMMENT= Low Level Virtual Machine compi
17LICENSE= modified-bsd 17LICENSE= modified-bsd
18 18
19WRKSRC= ${WRKDIR}/llvm-${PKGVERSION_NOREV}.src 19WRKSRC= ${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= chown gmake groff pod2html pod2man 22USE_TOOLS+= chown gmake groff pod2html pod2man
23GCC_REQD+= 4.7 4.8 23GCC_REQD+= 4.7 4.8
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --disable-assertions 25CONFIGURE_ARGS+= --disable-assertions
26CONFIGURE_ARGS+= --disable-bindings # disable OCaml 26CONFIGURE_ARGS+= --disable-bindings # disable OCaml
27CONFIGURE_ARGS+= --disable-timestamps 27CONFIGURE_ARGS+= --disable-timestamps
28CONFIGURE_ARGS+= --enable-optimized 28CONFIGURE_ARGS+= --enable-optimized
29 29
30MAKE_DIRS+= etc/llvm 
31 
32INSTALLATION_DIRS= bin lib libexec 
33 
34CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm 30CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
35 31
36TEST_TARGET= check unittests 32TEST_TARGET= check unittests
37 33
38DISTINFO_FILE= ${.CURDIR}/../../lang/clang/distinfo 34DISTINFO_FILE= ${.CURDIR}/../../lang/clang/distinfo
39PATCHDIR= ${.CURDIR}/../../lang/clang/patches 35PATCHDIR= ${.CURDIR}/../../lang/clang/patches
40 36
41.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
42 38
43.if ${_OPSYS_SHLIB_TYPE} == "dylib" 39.if ${_OPSYS_SHLIB_TYPE} == "dylib"
44PLIST_SUBST+= SOEXT="dylib" 40PLIST_SUBST+= SOEXT="dylib"
45.else 41.else
46PLIST_SUBST+= SOEXT="so" 42PLIST_SUBST+= SOEXT="so"
@@ -87,15 +83,14 @@ SUBST_SED.fix-paths+= -e 's,getToolChai @@ -87,15 +83,14 @@ SUBST_SED.fix-paths+= -e 's,getToolChai
87SUBST_SED.fix-paths+= -e 's,^.*cxa_finalize.*$$, ; //cxa_finalize.o,g' 83SUBST_SED.fix-paths+= -e 's,^.*cxa_finalize.*$$, ; //cxa_finalize.o,g'
88. endif 84. endif
89.endif 85.endif
90 86
91post-extract: 87post-extract:
92 mv ${WRKDIR}/libcxx-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/libcxx 88 mv ${WRKDIR}/libcxx-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/libcxx
93 mv ${WRKDIR}/compiler-rt-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/compiler-rt 89 mv ${WRKDIR}/compiler-rt-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/compiler-rt
94 mv ${WRKDIR}/cfe-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang 90 mv ${WRKDIR}/cfe-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
95.if ${OPSYS} == "SunOS" 91.if ${OPSYS} == "SunOS"
96 ${ECHO} "int sun_ld_needs_a_symbol=0;" >> ${WRKSRC}/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp 92 ${ECHO} "int sun_ld_needs_a_symbol=0;" >> ${WRKSRC}/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp
97.endif 93.endif
98 94
99.include "../../lang/python/tool.mk" 95.include "../../lang/python/tool.mk"
100.include "../../textproc/libxml2/buildlink3.mk" 
101.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/lang/clang/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/clang/PLIST 2015/03/03 12:04:08 1.15
+++ pkgsrc/lang/clang/PLIST 2015/03/04 13:57:42 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2015/03/03 12:04:08 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.16 2015/03/04 13:57:42 tnn Exp $
2bin/FileCheck 2bin/FileCheck
3bin/bugpoint 3bin/bugpoint
4bin/c-index-test 4bin/c-index-test
5bin/clang 5bin/clang
6bin/clang++ 6bin/clang++
7bin/clang-check 7bin/clang-check
8bin/clang-format 8bin/clang-format
9bin/clang-tblgen 9bin/clang-tblgen
10bin/count 10bin/count
11bin/llc 11bin/llc
12bin/lli 12bin/lli
13bin/lli-child-target 13bin/lli-child-target
14bin/llvm-ar 14bin/llvm-ar
@@ -1068,27 +1068,27 @@ include/llvm/Support/DataTypes.h @@ -1068,27 +1068,27 @@ include/llvm/Support/DataTypes.h
1068include/llvm/Support/Debug.h 1068include/llvm/Support/Debug.h
1069include/llvm/Support/Dwarf.h 1069include/llvm/Support/Dwarf.h
1070include/llvm/Support/DynamicLibrary.h 1070include/llvm/Support/DynamicLibrary.h
1071include/llvm/Support/ELF.h 1071include/llvm/Support/ELF.h
1072include/llvm/Support/ELFRelocs/AArch64.def 1072include/llvm/Support/ELFRelocs/AArch64.def
1073include/llvm/Support/ELFRelocs/ARM.def 1073include/llvm/Support/ELFRelocs/ARM.def
1074include/llvm/Support/ELFRelocs/Hexagon.def 1074include/llvm/Support/ELFRelocs/Hexagon.def
1075include/llvm/Support/ELFRelocs/Mips.def 1075include/llvm/Support/ELFRelocs/Mips.def
1076include/llvm/Support/ELFRelocs/PowerPC.def 1076include/llvm/Support/ELFRelocs/PowerPC.def
1077include/llvm/Support/ELFRelocs/PowerPC64.def 1077include/llvm/Support/ELFRelocs/PowerPC64.def
1078include/llvm/Support/ELFRelocs/Sparc.def 1078include/llvm/Support/ELFRelocs/Sparc.def
1079include/llvm/Support/ELFRelocs/SystemZ.def 1079include/llvm/Support/ELFRelocs/SystemZ.def
1080include/llvm/Support/ELFRelocs/i386.def 1080include/llvm/Support/ELFRelocs/i386.def
1081include/llvm/Support/ELFRelocs/${MACHINE_ARCH}.def 1081include/llvm/Support/ELFRelocs/x86_64.def
1082include/llvm/Support/Endian.h 1082include/llvm/Support/Endian.h
1083include/llvm/Support/EndianStream.h 1083include/llvm/Support/EndianStream.h
1084include/llvm/Support/Errc.h 1084include/llvm/Support/Errc.h
1085include/llvm/Support/Errno.h 1085include/llvm/Support/Errno.h
1086include/llvm/Support/ErrorHandling.h 1086include/llvm/Support/ErrorHandling.h
1087include/llvm/Support/ErrorOr.h 1087include/llvm/Support/ErrorOr.h
1088include/llvm/Support/FileOutputBuffer.h 1088include/llvm/Support/FileOutputBuffer.h
1089include/llvm/Support/FileSystem.h 1089include/llvm/Support/FileSystem.h
1090include/llvm/Support/FileUtilities.h 1090include/llvm/Support/FileUtilities.h
1091include/llvm/Support/Format.h 1091include/llvm/Support/Format.h
1092include/llvm/Support/FormattedStream.h 1092include/llvm/Support/FormattedStream.h
1093include/llvm/Support/GCOV.h 1093include/llvm/Support/GCOV.h
1094include/llvm/Support/GenericDomTree.h 1094include/llvm/Support/GenericDomTree.h