zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost: add -c option to C/C++ compile commands for clang. (#12694)

Browse Source
This commit is contained in:
t-karatsu 2019-09-05 00:07:31 +09:00 committed by Adam J. Stewart
parent 407834fffa
commit fc9e17289a
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/boost/clang-linux_add_option.patch Normal file
View File

@ -0,0 +1,20 @@
--- boost_1_63_0/tools/build/src/tools/clang-linux.jam.back 2019-09-04 15:51:25.052324575 +0900
+++ boost_1_63_0/tools/build/src/tools/clang-linux.jam 2019-09-04 15:52:22.278328007 +0900
@@ -153,7 +153,7 @@
}
actions compile.c++.pch {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
}
rule compile.c.pch ( targets * : sources * : properties * ) {
@@ -164,7 +164,7 @@
actions compile.c.pch
{
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
}
###############################################################################

20
var/spack/repos/builtin/packages/boost/clang-linux_add_option2.patch Normal file
View File

@ -0,0 +1,20 @@
--- boost_1_55_0/tools/build/v2/tools/clang-linux.jam.back 2019-09-04 16:43:57.542806983 +0900
+++ boost_1_55_0/tools/build/v2/tools/clang-linux.jam 2019-09-04 16:45:23.451800016 +0900
@@ -152,7 +152,7 @@
}
actions compile.c++.pch {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
}
rule compile.c.pch ( targets * : sources * : properties * ) {
@@ -163,7 +163,7 @@
actions compile.c.pch
{
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
}
###############################################################################

4
var/spack/repos/builtin/packages/boost/package.py
View File

@ -189,6 +189,10 @@ class Boost(Package):
# Change the method for version analysis when using Fujitsu compiler.
patch('fujitsu_version_analysis.patch', when='@1.67.0:%fj')
# Add option to C/C++ compile commands in clang-linux.jam
patch('clang-linux_add_option.patch', when='@1.56.0:1.63.0')
patch('clang-linux_add_option2.patch', when='@:1.55.0')
def url_for_version(self, version):
if version >= Version('1.63.0'):
url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2"