Merge pull request #220 from skalenetwork/skaled-1900-build-deps-with…

…-release Skaled 1900 build deps with release
skalenetwork · Feb 26, 2025 · c38b5a8 · c38b5a8
2 parents a66c601 + f2bdcb7
commit c38b5a8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -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
 

diff --git a/deps/build.sh b/deps/build.sh
@@ -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