Skip to content

Commit

Permalink
Revert "Enhance a bit our current boost usage (#194)"
Browse files Browse the repository at this point in the history 
This reverts commit fa664a2.
  • Loading branch information
@Pilot-Pirx
Pilot-Pirx committed Jan 14, 2024
1 parent fa664a2 commit 0714fca
Show file tree
Hide file tree
Showing 8 changed files with 451 additions and 395 deletions.
98 changes: 3 additions & 95 deletions main/boost/boost-clang.patch
View file
Original file line number Diff line number Diff line change
@@ -1,98 +1,6 @@
--- misc/boost_1_64_0/tools/build/src/tools/clang-linux.jam.orig 2017-04-17 02:22:26 UTC
+++ misc/build/boost_1_64_0/tools/build/src/tools/clang-linux.jam
@@ -31,7 +31,7 @@ generators.override clang-linux.compile.c.pch : pch.
generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ;

type.set-generated-target-suffix PCH
- : <toolset>clang <toolset-clang:platform>linux : pth ;
+ : <toolset>clang <toolset-clang:platform>linux : pch ;

toolset.inherit-rules clang-linux : gcc ;
toolset.inherit-flags clang-linux : gcc
@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources * : properties
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;

- local pth-file = [ on $(<) return $(PCH_FILE) ] ;
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ;

- if $(pth-file) {
- DEPENDS $(<) : $(pth-file) ;
+ if $(pch-file) {
+ DEPENDS $(<) : $(pch-file) ;
clang-linux.compile.c++.with-pch $(targets) : $(sources) ;
}
else {
- clang-linux.compile.c++.without-pth $(targets) : $(sources) ;
+ clang-linux.compile.c++.without-pch $(targets) : $(sources) ;
}
}

-actions compile.c++.without-pth {
+actions compile.c++.without-pch {
"$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -o "$(<)" "$(>)"
}

actions compile.c++.with-pch bind PCH_FILE
{
- "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pth -Xclang "$(PCH_FILE)" -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -o "$(<)" "$(>)"
}

rule compile.c ( targets * : sources * : properties * )
@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * : properties *
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;

- local pth-file = [ on $(<) return $(PCH_FILE) ] ;
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ;

- if $(pth-file) {
- DEPENDS $(<) : $(pth-file) ;
+ if $(pch-file) {
+ DEPENDS $(<) : $(pch-file) ;
clang-linux.compile.c.with-pch $(targets) : $(sources) ;
}
else {
- clang-linux.compile.c.without-pth $(targets) : $(sources) ;
+ clang-linux.compile.c.without-pch $(targets) : $(sources) ;
}
}

-actions compile.c.without-pth
+actions compile.c.without-pch
{
"$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}

actions compile.c.with-pch bind PCH_FILE
{
- "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pth -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
}

###############################################################################
@@ -153,7 +153,7 @@ rule compile.c++.pch ( targets * : sources * : propert
}

actions compile.c++.pch {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)"
}

rule compile.c.pch ( targets * : sources * : properties * ) {
@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources * : propertie

actions compile.c.pch
{
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)"
}

###############################################################################
--- misc/boost_1_64_0/boost/config/user.hpp 2023-01-20 06:52:20.006784000 +0200
+++ misc/build/boost_1_64_0/boost/config/user.hpp 2023-01-20 06:54:54.816087000 +0200
@@ -131,3 +131,6 @@
--- misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20 06:52:20.006784000 +0200
+++ misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20 06:54:54.816087000 +0200
@@ -122,3 +122,6 @@



Expand Down
10 changes: 5 additions & 5 deletions main/boost/boost-os2.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- misc/boost_1_64_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.000000000 +0200
+++ misc/build/boost_1_64_0/boost/tr1/detail/config.hpp 2013-07-04 12:49:12.000000000 +0200
--- misc/boost_1_55_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.000000000 +0200
+++ misc/build/boost_1_55_0/boost/tr1/detail/config.hpp 2013-07-04 12:49:12.000000000 +0200
@@ -9,6 +9,7 @@
#include <cstddef>

Expand All @@ -8,8 +8,8 @@
|| (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
// Disable use of #include_next on Linux as typically we are installed in a
// directory that is searched *after* the std lib include path.
--- misc/boost_1_64_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.000000000 +0200
+++ misc/build/boost_1_64_0/boost/tr1/detail/config_all.hpp 2013-07-04 12:50:44.000000000 +0200
--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.000000000 +0200
+++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2013-07-04 12:50:44.000000000 +0200
@@ -107,7 +107,7 @@
# endif

Expand All @@ -19,4 +19,4 @@
// Disable use of #include_next on Linux as typically we are installed in a directory that is searched
// *after* the std lib include path:
# define BOOST_TR1_DISABLE_INCLUDE_NEXT
Binary files misc/boost_1_64_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_64_0/libs/math/quaternion/TQE_EA.pdf differ
Binary files misc/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf differ

0 comments on commit 0714fca

Please sign in to comment.