mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-17 00:07:51 +00:00
Linux: static libgcc and libstdc++
This commit is contained in:
parent
08ceb5eba0
commit
20833579e9
3 changed files with 28 additions and 21 deletions
|
@ -143,7 +143,7 @@ elif [ "$platform" == "linux64" ]; then
|
||||||
echo "Configuring build for Android on Linux host"
|
echo "Configuring build for Android on Linux host"
|
||||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="armv7-a" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="armv7-a" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||||
elif [ "$STATIC" == true ]; then
|
elif [ "$STATIC" == true ]; then
|
||||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||||
else
|
else
|
||||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||||
fi
|
fi
|
||||||
|
@ -170,7 +170,7 @@ elif [ "$platform" == "linuxarmv7" ]; then
|
||||||
elif [ "$platform" == "linux" ]; then
|
elif [ "$platform" == "linux" ]; then
|
||||||
echo "Configuring build for Linux general"
|
echo "Configuring build for Linux general"
|
||||||
if [ "$STATIC" == true ]; then
|
if [ "$STATIC" == true ]; then
|
||||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||||
else
|
else
|
||||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||||
fi
|
fi
|
||||||
|
@ -219,21 +219,19 @@ if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
|
||||||
eval make -j$CPU_CORE_COUNT
|
eval make -j$CPU_CORE_COUNT
|
||||||
eval make install -j$CPU_CORE_COUNT
|
eval make install -j$CPU_CORE_COUNT
|
||||||
popd
|
popd
|
||||||
else
|
|
||||||
eval make -C $MONERO_DIR/build/release/contrib/epee all install
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# unbound is one more dependency. can't be merged to the wallet_merged
|
# build install epee
|
||||||
# since filename conflict (random.c.obj)
|
eval make -C $MONERO_DIR/build/release/contrib/epee all install
|
||||||
# for Linux, we use libunbound shipped with the system, so we don't need to build it
|
|
||||||
|
|
||||||
if [ "$platform" != "linux32" ] && ([ "$ANDROID" == true ] || [ "$platform" != "linux64" ]); then
|
|
||||||
echo "Building libunbound..."
|
# Install libunwind
|
||||||
|
echo "Installing libunbound..."
|
||||||
pushd $MONERO_DIR/build/release/external/unbound
|
pushd $MONERO_DIR/build/release/external/unbound
|
||||||
# no need to make, it was already built as dependency for libwallet
|
# no need to make, it was already built as dependency for libwallet
|
||||||
# make -j$CPU_CORE_COUNT
|
# make -j$CPU_CORE_COUNT
|
||||||
$make_exec install -j$CPU_CORE_COUNT
|
$make_exec install -j$CPU_CORE_COUNT
|
||||||
popd
|
popd
|
||||||
fi
|
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
|
@ -31,18 +31,22 @@ fi
|
||||||
|
|
||||||
# Copy dependencies
|
# Copy dependencies
|
||||||
EXCLUDE='libstdc++|libgcc_s.so|libc.so|libpthread'
|
EXCLUDE='libstdc++|libgcc_s.so|libc.so|libpthread'
|
||||||
|
INCLUDE='libunbound'
|
||||||
cp -rv $QT_DIR/qml $TARGET || exit
|
cp -rv $QT_DIR/qml $TARGET || exit
|
||||||
cp -rv $QT_DIR/plugins $TARGET || exit
|
cp -rv $QT_DIR/plugins $TARGET || exit
|
||||||
mkdir -p $TARGET/libs || exit
|
mkdir -p $TARGET/libs || exit
|
||||||
ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
|
#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep $INCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
|
||||||
ldd $TARGET/plugins/platforms/libqxcb.so| grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
|
#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
|
||||||
cp -v $QTXML_DIR/libQt5XmlPatterns.so.5 $TARGET/libs || exit
|
#ldd $TARGET/plugins/platforms/libqxcb.so| grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
|
||||||
|
#cp -v $QTXML_DIR/libQt5XmlPatterns.so.5 $TARGET/libs || exit
|
||||||
|
|
||||||
# Create start script
|
# Create start script
|
||||||
cat > $TARGET/start-gui.sh <<EOL
|
cat > $TARGET/start-gui.sh <<EOL
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# export LD_LIBRARY_PATH=\`pwd\`/libs
|
export LD_LIBRARY_PATH=\`pwd\`/libs
|
||||||
export QT_PLUGIN_PATH=\`pwd\`/plugins
|
export QT_PLUGIN_PATH=\`pwd\`/plugins
|
||||||
export QML2_IMPORT_PATH=\`pwd\`/qml
|
export QML2_IMPORT_PATH=\`pwd\`/qml
|
||||||
./$GUI_EXEC
|
./$GUI_EXEC
|
||||||
EOL
|
EOL
|
||||||
|
|
||||||
|
chmod +x $TARGET/start-gui.sh
|
|
@ -197,7 +197,12 @@ linux {
|
||||||
CONFIG(static) {
|
CONFIG(static) {
|
||||||
message("using static libraries")
|
message("using static libraries")
|
||||||
LIBS+= -Wl,-Bstatic
|
LIBS+= -Wl,-Bstatic
|
||||||
|
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
|
||||||
|
contains(QT_ARCH, x86_64) {
|
||||||
|
LIBS+= -lunbound
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LIBS+= \
|
LIBS+= \
|
||||||
-lboost_serialization \
|
-lboost_serialization \
|
||||||
-lboost_thread \
|
-lboost_thread \
|
||||||
|
@ -210,7 +215,7 @@ linux {
|
||||||
-lssl \
|
-lssl \
|
||||||
-lcrypto \
|
-lcrypto \
|
||||||
-Wl,-Bdynamic \
|
-Wl,-Bdynamic \
|
||||||
-ldl
|
-lGL
|
||||||
# currently monero has an issue with "static" build and linunwind-dev,
|
# currently monero has an issue with "static" build and linunwind-dev,
|
||||||
# so we link libunwind-dev only for non-Ubuntu distros
|
# so we link libunwind-dev only for non-Ubuntu distros
|
||||||
CONFIG(libunwind_off) {
|
CONFIG(libunwind_off) {
|
||||||
|
|
Loading…
Reference in a new issue