Skip to content
Snippets Groups Projects
Commit ab061303 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'hotfix-remove_build_env' into 'master'

Hotfix remove build env

See merge request cellframe/prod_build_cellframe-node!21
parents b5c6ebe4 dc0bed7c
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,9 @@ DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl" ...@@ -10,6 +10,9 @@ DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl"
# Store write config to new if present smth # Store write config to new if present smth
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg" DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
#fixed link with python library
[ -e "/usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0" ] || ln -sf /usr/lib/x86_64-linux-gnu/libpython3.*.so.1.0 /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0
#unpack PYTHON_ENV #unpack PYTHON_ENV
......
...@@ -64,7 +64,7 @@ if [[ $ARCH_VERSION == "arm" ]]; then ...@@ -64,7 +64,7 @@ if [[ $ARCH_VERSION == "arm" ]]; then
fi fi
if [[ $ARCH_VERSION == "amd64" ]]; then if [[ $ARCH_VERSION == "amd64" ]]; then
sed -i 's/#set(BUILD_WITH_PYTHON_ENV ON)/set(BUILD_WITH_PYTHON_ENV ON)/' ../CMakeLists.txt || error=$? #sed -i 's/#set(BUILD_WITH_PYTHON_ENV ON)/set(BUILD_WITH_PYTHON_ENV ON)/' ../CMakeLists.txt || error=$?
sed -i 's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/' ../CMakeLists.txt || error=$?cd sed -i 's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/' ../CMakeLists.txt || error=$?cd
${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ ${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment