View | Details | Raw Unified | Return to bug 221908 | Differences between
and this patch

Collapse All | Expand All

(-)devel/llvm-cheri/Makefile (-1 / +1 lines)
Lines 103-109 Link Here
103
.include <bsd.port.options.mk>
103
.include <bsd.port.options.mk>
104
104
105
# keep in sync with /usr/src/lib/clang/clang.build.mk
105
# keep in sync with /usr/src/lib/clang/clang.build.mk
106
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
106
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
107
107
108
.if ${PORT_OPTIONS:MCLANG}
108
.if ${PORT_OPTIONS:MCLANG}
109
COMMANDS+=	clang \
109
COMMANDS+=	clang \
(-)devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig	2015-07-20 23:51:12 UTC
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -718,7 +718,17 @@ def add_magic_target_components(parser, 
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig	2015-10-02 16:42:59 UTC
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -747,7 +747,17 @@ def add_magic_target_components(parser, 
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)devel/llvm33/Makefile (-1 / +1 lines)
Lines 88-94 Link Here
88
.include <bsd.port.options.mk>
88
.include <bsd.port.options.mk>
89
89
90
# keep in sync with /usr/src/lib/clang/clang.build.mk
90
# keep in sync with /usr/src/lib/clang/clang.build.mk
91
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
91
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
92
92
93
.if ${PORT_OPTIONS:MASSERTS}
93
.if ${PORT_OPTIONS:MASSERTS}
94
CONFIGURE_ARGS+=	--enable-assertions
94
CONFIGURE_ARGS+=	--enable-assertions
(-)devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)devel/llvm34/Makefile (-1 / +1 lines)
Lines 94-100 Link Here
94
.endif
94
.endif
95
95
96
# keep in sync with /usr/src/lib/clang/clang.build.mk
96
# keep in sync with /usr/src/lib/clang/clang.build.mk
97
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
97
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
98
98
99
.if ${PORT_OPTIONS:MASSERTS}
99
.if ${PORT_OPTIONS:MASSERTS}
100
CONFIGURE_ARGS+=	--enable-assertions
100
CONFIGURE_ARGS+=	--enable-assertions
(-)devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)devel/llvm35/Makefile (-1 / +1 lines)
Lines 88-94 Link Here
88
.include <bsd.port.options.mk>
88
.include <bsd.port.options.mk>
89
89
90
# keep in sync with /usr/src/lib/clang/clang.build.mk
90
# keep in sync with /usr/src/lib/clang/clang.build.mk
91
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
91
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
92
92
93
.if ${PORT_OPTIONS:MASSERTS}
93
.if ${PORT_OPTIONS:MASSERTS}
94
CONFIGURE_ARGS+=	--enable-assertions
94
CONFIGURE_ARGS+=	--enable-assertions
(-)devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)devel/llvm38/Makefile (-1 / +2 lines)
Lines 13-18 Link Here
13
COMMENT=	LLVM and Clang
13
COMMENT=	LLVM and Clang
14
14
15
BROKEN_armv6=		fails to compile: fatal error: llvm/IR/Attributes.inc file not found
15
BROKEN_armv6=		fails to compile: fatal error: llvm/IR/Attributes.inc file not found
16
BROKEN_armv7=		fails to compile: fatal error: llvm/IR/Attributes.inc file not found
16
BROKEN_powerpc64=	fails to compile: internal compiler error: Killed (program cc1plus)
17
BROKEN_powerpc64=	fails to compile: internal compiler error: Killed (program cc1plus)
17
18
18
LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
19
LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
Lines 163-169 Link Here
163
.include <bsd.port.options.mk>
164
.include <bsd.port.options.mk>
164
165
165
# keep in sync with /usr/src/lib/clang/clang.build.mk
166
# keep in sync with /usr/src/lib/clang/clang.build.mk
166
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
167
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
167
168
168
.if ${PORT_OPTIONS:MCLANG}
169
.if ${PORT_OPTIONS:MCLANG}
169
COMMANDS+=	clang \
170
COMMANDS+=	clang \
(-)devel/llvm39/Makefile (-3 / +3 lines)
Lines 178-184 Link Here
178
.include <bsd.port.options.mk>
178
.include <bsd.port.options.mk>
179
179
180
# keep in sync with /usr/src/lib/clang/clang.build.mk
180
# keep in sync with /usr/src/lib/clang/clang.build.mk
181
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
181
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
182
182
183
.if ${PORT_OPTIONS:MCLANG}
183
.if ${PORT_OPTIONS:MCLANG}
184
COMMANDS+=	clang \
184
COMMANDS+=	clang \
Lines 262-268 Link Here
262
	libclang_rt.ubsan_standalone_cxx-x86_64.a \
262
	libclang_rt.ubsan_standalone_cxx-x86_64.a \
263
	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
263
	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
264
.endif
264
.endif
265
.if ${ARCH} == "i386"
265
.if ${ARCH} == i386
266
_COMPILER_RT_LIBS+= \
266
_COMPILER_RT_LIBS+= \
267
	libclang_rt.asan-i386.a \
267
	libclang_rt.asan-i386.a \
268
	libclang_rt.asan-i386.so \
268
	libclang_rt.asan-i386.so \
Lines 296-302 Link Here
296
CXXFLAGS+=	-D_GLIBCXX_USE_C99
296
CXXFLAGS+=	-D_GLIBCXX_USE_C99
297
.endif
297
.endif
298
298
299
.if ${ARCH} == "armv6"
299
.if ${ARCH} == armv6 || ${ARCH} == armv7
300
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
300
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
301
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
301
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
302
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
302
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
(-)devel/llvm40/Makefile (-3 / +3 lines)
Lines 185-191 Link Here
185
.include <bsd.port.options.mk>
185
.include <bsd.port.options.mk>
186
186
187
# keep in sync with /usr/src/lib/clang/clang.build.mk
187
# keep in sync with /usr/src/lib/clang/clang.build.mk
188
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
188
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
189
189
190
.if ${PORT_OPTIONS:MCLANG}
190
.if ${PORT_OPTIONS:MCLANG}
191
COMMANDS+=	c-index-test \
191
COMMANDS+=	c-index-test \
Lines 274-280 Link Here
274
	libclang_rt.ubsan_standalone_cxx-x86_64.a \
274
	libclang_rt.ubsan_standalone_cxx-x86_64.a \
275
	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
275
	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
276
.endif
276
.endif
277
.if ${ARCH} == "i386"
277
.if ${ARCH} == i386
278
_COMPILER_RT_LIBS+= \
278
_COMPILER_RT_LIBS+= \
279
	libclang_rt.asan-i386.a \
279
	libclang_rt.asan-i386.a \
280
	libclang_rt.asan-i386.so \
280
	libclang_rt.asan-i386.so \
Lines 308-314 Link Here
308
CXXFLAGS+=	-D_GLIBCXX_USE_C99
308
CXXFLAGS+=	-D_GLIBCXX_USE_C99
309
.endif
309
.endif
310
310
311
.if ${ARCH} == "armv6"
311
.if ${ARCH} == armv6 || ${ARCH} == armv7
312
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
312
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
313
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
313
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
314
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
314
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
(-)lang/clang33/Makefile (-1 / +1 lines)
Lines 74-80 Link Here
74
.include <bsd.port.options.mk>
74
.include <bsd.port.options.mk>
75
75
76
# keep in sync with /usr/src/lib/clang/clang.build.mk
76
# keep in sync with /usr/src/lib/clang/clang.build.mk
77
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
77
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
78
78
79
.if ${PORT_OPTIONS:MASSERTS}
79
.if ${PORT_OPTIONS:MASSERTS}
80
CONFIGURE_ARGS+=	--enable-assertions
80
CONFIGURE_ARGS+=	--enable-assertions
(-)lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)lang/clang34/Makefile (-1 / +1 lines)
Lines 80-86 Link Here
80
.endif
80
.endif
81
81
82
# keep in sync with /usr/src/lib/clang/clang.build.mk
82
# keep in sync with /usr/src/lib/clang/clang.build.mk
83
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
83
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
84
84
85
.if ${PORT_OPTIONS:MASSERTS}
85
.if ${PORT_OPTIONS:MASSERTS}
86
CONFIGURE_ARGS+=	--enable-assertions
86
CONFIGURE_ARGS+=	--enable-assertions
(-)lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',
(-)lang/clang35/Makefile (-1 / +1 lines)
Lines 86-92 Link Here
86
.include <bsd.port.pre.mk>
86
.include <bsd.port.pre.mk>
87
87
88
# keep in sync with /usr/src/lib/clang/clang.build.mk
88
# keep in sync with /usr/src/lib/clang/clang.build.mk
89
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
89
CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
90
90
91
.if ${PORT_OPTIONS:MASSERTS}
91
.if ${PORT_OPTIONS:MASSERTS}
92
pre-fetch:
92
pre-fetch:
(-)lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py (-3 / +4 lines)
Lines 1-6 Link Here
1
--- utils/llvm-build/llvmbuild/main.py.orig
1
--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
2
+++ utils/llvm-build/llvmbuild/main.py
2
+++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
3
@@ -660,7 +660,17 @@
3
@@ -751,7 +751,18 @@
4
 
4
 
5
     # We handle a few special cases of target names here for historical
5
     # We handle a few special cases of target names here for historical
6
     # reasons, as these are the names configure currently comes up with.
6
     # reasons, as these are the names configure currently comes up with.
Lines 10-15 Link Here
10
+			   'armeb' : 'ARM',
10
+			   'armeb' : 'ARM',
11
+			   'armv6' : 'ARM',
11
+			   'armv6' : 'ARM',
12
+			   'armv6hf' : 'ARM',
12
+			   'armv6hf' : 'ARM',
13
+			   'armv7' : 'ARM',
13
+			   'i386' : 'X86',
14
+			   'i386' : 'X86',
14
+			   'mips' : 'Mips',
15
+			   'mips' : 'Mips',
15
+			   'powerpc' : 'PowerPC',
16
+			   'powerpc' : 'PowerPC',

Return to bug 221908