Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skaled 1900 build deps with release #220

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Skaled 1900 build deps with release #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8e8ed8
skaled 1900 build deps with release
olehnikolaiev Jan 9, 2025
83b39fd
skaled 1900 fix emscripten build
olehnikolaiev Jan 9, 2025
0732fb6
skaled 1900 format
olehnikolaiev Jan 9, 2025
3dc478d
1900 format
olehnikolaiev Jan 9, 2025
76dc3ed
1900 format
olehnikolaiev Jan 9, 2025
8160ba2
1900 format
olehnikolaiev Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
export CC=gcc-11
export CXX=g++-11
export TARGET=all
export CMAKE_BUILD_TYPE=Release
cd deps
./build.sh

Expand Down
45 changes: 25 additions & 20 deletions deps/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,36 +585,41 @@ then
if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]];
then
BOOST_LIBRARIES="program_options"
else
else
BOOST_LIBRARIES="system,thread,filesystem,regex,atomic,program_options"
if [ "$SKALED_DEPS_CHAIN" = "1" ];
then
BOOST_LIBRARIES="${BOOST_LIBRARIES},context,iostreams,fiber,log,chrono"
fi

if [ "$SKALED_DEPS_CHAIN" = "1" ];
then
BOOST_LIBRARIES="${BOOST_LIBRARIES},context,iostreams,fiber,log,chrono"
fi
fi
eval ./bootstrap.sh --prefix="$INSTALL_ROOT" --with-libraries="$BOOST_LIBRARIES"

if [ ${ARCH} = "arm" ]
then
sed -i -e 's#using gcc ;#using gcc : arm : /usr/local/toolchains/gcc7.2-arm/bin/arm-linux-gnueabihf-g++ ;#g' project-config.jam
eval ./b2 "${CONF_CROSSCOMPILING_OPTS_BOOST}" cxxflags=-fPIC cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install
else
if [ "$UNIX_SYSTEM_NAME" = "Darwin" ];
if [ "$DEBUG" = "1" ]; then
variant=debug
else
variant=release
fi

if [ ${ARCH} = "arm" ]
then
eval ./b2 cxxflags=-fPIC toolset=clang cxxstd=17 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install
sed -i -e 's#using gcc ;#using gcc : arm : /usr/local/toolchains/gcc7.2-arm/bin/arm-linux-gnueabihf-g++ ;#g' project-config.jam
eval ./b2 "${CONF_CROSSCOMPILING_OPTS_BOOST}" cxxflags=-fPIC cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=${variant} link=static threading=multi install
else
if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]];
if [ "$UNIX_SYSTEM_NAME" = "Darwin" ];
then
eval ./b2 toolset=emscripten cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --disable-icu --layout=system variant=debug link=static install
cd bin.v2/libs/program_options/build/emscripten-2.0.31/debug/cxxstd-14-iso/link-static/threading-multi/
eval emar q "libboost_program_options.a" ./*.bc
eval cp "libboost_program_options.a" "${LIBRARIES_ROOT}"
eval ./b2 cxxflags=-fPIC toolset=clang cxxstd=17 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=${variant} link=static threading=multi install
else
eval ./b2 cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install
if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]];
then
eval ./b2 toolset=emscripten cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --disable-icu --layout=system variant=${variant} link=static install
cd bin.v2/libs/program_options/build/emscripten-2.0.31/${variant}/cxxstd-14-iso/link-static/threading-multi/
eval emar q "libboost_program_options.a" ./*.bc
eval cp "libboost_program_options.a" "${LIBRARIES_ROOT}"
else
eval ./b2 cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=${variant} link=static threading=multi install
fi
fi
fi
fi
cd ..
cd "$SOURCES_ROOT"
else
Expand Down
Loading