Attachment 185899 Details for Bug 221908 – updated patch

[patch] updated patch

brooks (text/plain), 13.85 KB, created by Mark Linimon on 2017-08-29 21:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2017-08-29 21:20:17 UTC

Size: 13.85 KB

patch

obsolete

>Index: devel/llvm-cheri/Makefile
>===================================================================
>--- devel/llvm-cheri/Makefile	(revision 448901)
>+++ devel/llvm-cheri/Makefile	(working copy)
>@@ -103,7 +103,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MCLANG}
> COMMANDS+=	clang \
>Index: devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig	2015-07-20 23:51:12 UTC
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -718,7 +718,17 @@ def add_magic_target_components(parser, 
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig	2015-10-02 16:42:59 UTC
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -747,7 +747,17 @@ def add_magic_target_components(parser, 
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: devel/llvm33/Makefile
>===================================================================
>--- devel/llvm33/Makefile	(revision 448901)
>+++ devel/llvm33/Makefile	(working copy)
>@@ -88,7 +88,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> CONFIGURE_ARGS+=	--enable-assertions
>Index: devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: devel/llvm34/Makefile
>===================================================================
>--- devel/llvm34/Makefile	(revision 448901)
>+++ devel/llvm34/Makefile	(working copy)
>@@ -94,7 +94,7 @@
> .endif
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> CONFIGURE_ARGS+=	--enable-assertions
>Index: devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: devel/llvm35/Makefile
>===================================================================
>--- devel/llvm35/Makefile	(revision 448901)
>+++ devel/llvm35/Makefile	(working copy)
>@@ -88,7 +88,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> CONFIGURE_ARGS+=	--enable-assertions
>Index: devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: devel/llvm38/Makefile
>===================================================================
>--- devel/llvm38/Makefile	(revision 448901)
>+++ devel/llvm38/Makefile	(working copy)
>@@ -13,6 +13,7 @@
> COMMENT=	LLVM and Clang
> 
> BROKEN_armv6=		fails to compile: fatal error: llvm/IR/Attributes.inc file not found
>+BROKEN_armv7=		fails to compile: fatal error: llvm/IR/Attributes.inc file not found
> BROKEN_powerpc64=	fails to compile: internal compiler error: Killed (program cc1plus)
> 
> LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
>@@ -163,7 +164,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MCLANG}
> COMMANDS+=	clang \
>Index: devel/llvm39/Makefile
>===================================================================
>--- devel/llvm39/Makefile	(revision 448901)
>+++ devel/llvm39/Makefile	(working copy)
>@@ -178,7 +178,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MCLANG}
> COMMANDS+=	clang \
>@@ -262,7 +262,7 @@
> 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
> 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
> .endif
>-.if ${ARCH} == "i386"
>+.if ${ARCH} == i386
> _COMPILER_RT_LIBS+= \
> 	libclang_rt.asan-i386.a \
> 	libclang_rt.asan-i386.so \
>@@ -296,7 +296,7 @@
> CXXFLAGS+=	-D_GLIBCXX_USE_C99
> .endif
> 
>-.if ${ARCH} == "armv6"
>+.if ${ARCH} == armv6 || ${ARCH} == armv7
> BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
> CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
> MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
>Index: devel/llvm40/Makefile
>===================================================================
>--- devel/llvm40/Makefile	(revision 448901)
>+++ devel/llvm40/Makefile	(working copy)
>@@ -185,7 +185,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MCLANG}
> COMMANDS+=	c-index-test \
>@@ -274,7 +274,7 @@
> 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
> 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
> .endif
>-.if ${ARCH} == "i386"
>+.if ${ARCH} == i386
> _COMPILER_RT_LIBS+= \
> 	libclang_rt.asan-i386.a \
> 	libclang_rt.asan-i386.so \
>@@ -308,7 +308,7 @@
> CXXFLAGS+=	-D_GLIBCXX_USE_C99
> .endif
> 
>-.if ${ARCH} == "armv6"
>+.if ${ARCH} == armv6 || ${ARCH} == armv7
> BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
> CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
> MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
>
>Index: lang/clang33/Makefile
>===================================================================
>--- lang/clang33/Makefile	(revision 448901)
>+++ lang/clang33/Makefile	(working copy)
>@@ -74,7 +74,7 @@
> .include <bsd.port.options.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> CONFIGURE_ARGS+=	--enable-assertions
>Index: lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: lang/clang34/Makefile
>===================================================================
>--- lang/clang34/Makefile	(revision 448901)
>+++ lang/clang34/Makefile	(working copy)
>@@ -80,7 +80,7 @@
> .endif
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> CONFIGURE_ARGS+=	--enable-assertions
>Index: lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',
>Index: lang/clang35/Makefile
>===================================================================
>--- lang/clang35/Makefile	(revision 448901)
>+++ lang/clang35/Makefile	(working copy)
>@@ -86,7 +86,7 @@
> .include <bsd.port.pre.mk>
> 
> # keep in sync with /usr/src/lib/clang/clang.build.mk
>-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
>+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
> 
> .if ${PORT_OPTIONS:MASSERTS}
> pre-fetch:
>Index: lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 448901)
>+++ lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,6 +1,6 @@
>---- utils/llvm-build/llvmbuild/main.py.orig
>-+++ utils/llvm-build/llvmbuild/main.py
>-@@ -660,7 +660,17 @@
>+--- utils/llvm-build/llvmbuild/main.py.dist	2016-08-08 13:58:02.000000000 +0000
>++++ utils/llvm-build/llvmbuild/main.py	2017-08-29 12:47:14.547497255 +0000
>+@@ -751,7 +751,18 @@
>  
>      # We handle a few special cases of target names here for historical
>      # reasons, as these are the names configure currently comes up with.
>@@ -10,6 +10,7 @@
> +			   'armeb' : 'ARM',
> +			   'armv6' : 'ARM',
> +			   'armv6hf' : 'ARM',
>++			   'armv7' : 'ARM',
> +			   'i386' : 'X86',
> +			   'mips' : 'Mips',
> +			   'powerpc' : 'PowerPC',

Actions: View | Diff

Attachments on bug 221908: 185877 | 185899 | 187047