Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #5719 from BOINC/vko_remove_unused_configure_parameter 

[linux] remove unused '--enable-vcpkg' configure parameter
This commit is contained in:
Vitalii Koshura 2024-07-31 00:42:53 +02:00 committed by GitHub
parent 2702b674a5 f6ad3bd01f
commit 87bf0b8715
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build_boinc_armv6.sh
View File

@ -69,7 +69,7 @@ if [ -n "$COMPILEBOINC" ]; then
fi
if [ -n "$CONFIGURE" ]; then
./_autosetup
if [ $BUILD_WITH_VCPKG = "yes" ]; then
if [ $BUILD_APPS_WITH_VCPKG = "yes" ]; then
export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
fi
./configure --host=armv6-linux --with-boinc-platform="arm-android-linux-gnu" $CONFIG_FLAGS --disable-server --disable-manager --disable-shared --enable-static --disable-largefile

6
android/build_example_arm64.sh
View File

@ -40,12 +40,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall -funroll-loo
export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -lz"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
ENABLE_VCPKG_FLAG=""
if [ $BUILD_WITH_VCPKG = "yes" ]; then
ENABLE_VCPKG_FLAG="--enable-vcpkg"
fi
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then

6
android/build_example_armv6.sh
View File

@ -39,12 +39,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptio
export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -march=armv6"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
ENABLE_VCPKG_FLAG=""
if [ $BUILD_WITH_VCPKG = "yes" ]; then
ENABLE_VCPKG_FLAG="--enable-vcpkg"
fi
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then

6
android/build_example_x86_64.sh
View File

@ -40,12 +40,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall -funroll-loo
export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -lz"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
ENABLE_VCPKG_FLAG=""
if [ $BUILD_WITH_VCPKG = "yes" ]; then
ENABLE_VCPKG_FLAG="--enable-vcpkg"
fi
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then

2
configure.ac
View File

@ -1128,7 +1128,7 @@ AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
AM_CONDITIONAL(OS_ARMV6_LINUX, [echo $host_alias | grep '^armv6-linux' > /dev/null])
AM_CONDITIONAL(ANDROID, [test x"${ANDROID}" = xyes])
AM_CONDITIONAL(BUILD_WITH_VCPKG, [test "${enable_apps_vcpkg}" = yes])
AM_CONDITIONAL(BUILD_APPS_WITH_VCPKG, [test "${enable_apps_vcpkg}" = yes])
AM_CONDITIONAL(BUILD_WITH_VBOX, [test "${enable_apps_vbox}" = yes])
AM_CONDITIONAL(BUILD_WITH_MINGW, [test "${enable_apps_mingw}" = yes])
AM_CONDITIONAL(BUILD_WITH_GUI, [test "${enable_apps_gui}" = yes])

6
samples/Makefile.am
View File

@ -14,8 +14,8 @@ if BUILD_WITH_GUI
export BUILD_WITH_GUI="yes"
endif
if BUILD_WITH_VCPKG
export BUILD_WITH_VCPKG="yes"
if BUILD_APPS_WITH_VCPKG
export BUILD_APPS_WITH_VCPKG="yes"
endif
## list the apps that should be build
@ -26,7 +26,7 @@ if BUILD_WITH_VBOX
SUBDIRS += vboxmonitor vboxwrapper
endif
if BUILD_WITH_VCPKG
if BUILD_APPS_WITH_VCPKG
SUBDIRS += wrappture
endif

2
samples/condor/Makefile
View File

@ -30,7 +30,7 @@ CXXFLAGS += \
-L$(BOINC_ZIP_DIR)
ifdef BUILD_WITH_VCPKG
ifdef BUILD_APPS_WITH_VCPKG
BUILD_DIR = $(BOINC_DIR)/3rdParty/linux
VCPKG_DIR ?= $(BUILD_DIR)/vcpkg/installed/x64-linux

2
samples/example_app/Makefile
View File

@ -47,7 +47,7 @@ LIBUI = -lX11 -lXmu
LIBFTGL = -lftgl
LIBJPEG = -ljpeg
ifdef BUILD_WITH_VCPKG
ifdef BUILD_APPS_WITH_VCPKG
BUILD_DIR = $(BOINC_DIR)/3rdParty/linux
VCPKG_DIR ?= $(BUILD_DIR)/vcpkg/installed/x64-linux

2
samples/sporadic/Makefile
View File

@ -30,7 +30,7 @@ CXXFLAGS += -g \
-L$(BOINC_LIB_DIR) \
-L.
ifdef BUILD_WITH_VCPKG
ifdef BUILD_APPS_WITH_VCPKG
BUILD_DIR = $(BOINC_DIR)/3rdParty/linux
VCPKG_DIR ?= $(BUILD_DIR)/vcpkg/installed/x64-linux

2
wasm/ci_configure_client.sh
View File

@ -25,4 +25,4 @@ if [ "debug" == "$1" ]; then
fi
export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
emconfigure ./configure $debug_flags --enable-wasm --enable-vcpkg --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager
emconfigure ./configure $debug_flags --enable-wasm --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager