Skip to content

Commit 4335ac0

Browse files
committed
msys2 wget2 and boost c++ standard
1 parent ce2216b commit 4335ac0

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/build-msys2.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
base-devel
4646
unzip
4747
dos2unix
48+
wget2
4849
git
4950
pacboy: >-
5051
gcc:p

apothecary/formulas/boost/boost.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ TARBALL=$UNCOMPRESSED_NAME.tar.gz
1616
# need to maybe migrate to github https://github.com/boostorg/boost
1717

1818
BOOST_LIBS="filesystem system"
19-
EXTRA_CPPFLAGS="-std=c++11 -stdlib=libc++ -fPIC -DBOOST_SP_USE_SPINLOCK"
19+
EXTRA_CPPFLAGS="-std=c++${CPP_STANDARD} -stdlib=libc++ -fPIC -DBOOST_SP_USE_SPINLOCK"
2020

2121
# tools for git use
2222

@@ -86,15 +86,15 @@ function prepare() {
8686
# executed inside the lib src dir
8787
function build() {
8888
if [ "$TYPE" == "vs" ]; then
89-
./b2 --debug-configuration -j${PARALLEL_MAKE} cxxflags="-std=c++11 -stdlib=libc++ -Wno-implicit-function-declaration" threading=multi variant=release --build-dir=build --stage-dir=stage --with-filesystem link=static address-model=$ARCH stage
89+
./b2 --debug-configuration -j${PARALLEL_MAKE} cxxflags="-std=c++${CPP_STANDARD} -stdlib=libc++ -Wno-implicit-function-declaration" threading=multi variant=release --build-dir=build --stage-dir=stage --with-filesystem link=static address-model=$ARCH stage
9090
mv stage stage_$ARCH
9191

9292
cd tools/bcp
9393
../../b2
9494

9595

9696
elif [ "$TYPE" == "osx" ]; then
97-
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++11 -stdlib=libc++ -arch arm64 -arch x86_64 -Wno-implicit-function-declaration -mmacosx-version-min=${OSX_MIN_SDK_VER}" linkflags="-stdlib=libc++" threading=multi variant=release --build-dir=build --stage-dir=stage link=static stage
97+
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++${CPP_STANDARD} -stdlib=libc++ -arch arm64 -arch x86_64 -Wno-implicit-function-declaration -mmacosx-version-min=${OSX_MIN_SDK_VER}" linkflags="-stdlib=libc++" threading=multi variant=release --build-dir=build --stage-dir=stage link=static stage
9898
cd tools/bcp
9999
../../b2
100100
elif [[ "$TYPE" == "ios" || "${TYPE}" == "tvos" ]]; then
@@ -281,12 +281,12 @@ EOF
281281
echo "Finished Build for $TYPE"
282282
elif [ "$TYPE" == "emscripten" ]; then
283283
cp $FORMULA_DIR/project-config-emscripten.jam project-config.jam
284-
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++11" threading=multi threadapi=pthread variant=release --build-dir=build --stage-dir=stage link=static stage
284+
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++${CPP_STANDARD}" threading=multi threadapi=pthread variant=release --build-dir=build --stage-dir=stage link=static stage
285285
elif [ "$TYPE" == "android" ]; then
286286
rm -rf stage stage_$ARCH
287287

288288
source ../../android_configure.sh $ABI
289-
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++11 $CFLAGS" cflags="$CFLAGS" threading=multi threadapi=pthread target-os=android variant=release --build-dir=build_$ARCH link=static stage
289+
./b2 -j${PARALLEL_MAKE} toolset=clang cxxflags="-std=c++${CPP_STANDARD} $CFLAGS" cflags="$CFLAGS" threading=multi threadapi=pthread target-os=android variant=release --build-dir=build_$ARCH link=static stage
290290

291291
# Run ranlib on binaries (not called corectly by b2)
292292
${RANLIB} stage/lib/libboost_filesystem.a

0 commit comments

Comments
 (0)