Skip to content

Commit 03ac350

Browse files
NickHardemanNickHardeman
authored
Remove boost from linux scripts, download_libs (#8306)
* Remove boost mentions from emscripten, macOS xcconfig, makefileCommon, msys2. * remove boost from ci linux scripts. * remove boost from dev scripts download and local_libs. * remove boost from linux install_dependencies.
1 parent 984c9c6 commit 03ac350

17 files changed

Lines changed: 11 additions & 34 deletions

File tree

‎libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/graphics/ofCairoRende
225225
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/gl/ofGLRenderer.cpp
226226
# third party
227227
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glew/%
228-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/include/boost/%
229228
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/videoInput/%
230229
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
231230
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/%

‎libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -fra
5555
//
5656

5757

58-
// BOOST can be enabled in OF Core by uncommenting this block
59-
//HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
60-
//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
61-
//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
62-
//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
63-
//OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
64-
//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
65-
6658

6759
ALWAYS_SEARCH_USER_PATHS = NO
6860
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES

‎libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/FreeImage/%
268268
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/assimp/%
269269
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/rtAudio/%
270270
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/%
271-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
272271
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/%
273272
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/%
274273
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/uriparser/%
@@ -332,9 +331,6 @@ endif
332331
PLATFORM_LIBRARIES += freeimage
333332
ifeq ($(OF_USING_STD_FS),1)
334333
PLATFORM_LIBRARIES += stdc++fs
335-
# else
336-
# PLATFORM_LIBRARIES += boost_filesystem
337-
# PLATFORM_LIBRARIES += boost_system
338334
endif
339335
PLATFORM_LIBRARIES += pugixml
340336
PLATFORM_LIBRARIES += uriparser

‎libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/FreeImage/%
190190
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glm/%
191191
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/json/%
192192
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/%
193-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
194193
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/%
195194
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/%
196195
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/pugixml/%
@@ -234,7 +233,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/utf8/%
234233
PLATFORM_LIBRARIES += ksuser opengl32 gdi32 msimg32 glu32 dsound winmm strmiids #dxguid
235234
PLATFORM_LIBRARIES += uuid ole32 oleaut32 setupapi wsock32 ws2_32 Iphlpapi Comdlg32
236235
PLATFORM_LIBRARIES += freeimage
237-
# PLATFORM_LIBRARIES += boost_filesystem-mt boost_system-mt
238236
PLATFORM_LIBRARIES += mf mfplat mfuuid mfreadwrite
239237
# PLATFORM_LIBRARIES += glfw3
240238

‎scripts/ci/linuxarmv7l/arch-bootstrap.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DEFAULT_REPO_URL="http://mirrors.kernel.org/archlinux"
3232
DEFAULT_ARM_REPO_URL="http://mirror.archlinuxarm.org"
3333

3434
PACMAN_PACKAGES_ARM=(
35-
acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs coreutils bash grep gawk file tar systemd sed gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa mesa-libgl fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp boost cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv uriparser curl libxml2 pugixml libpsl icu
35+
acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs coreutils bash grep gawk file tar systemd sed gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa mesa-libgl fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv uriparser curl libxml2 pugixml libpsl icu
3636
)
3737
BASIC_PACKAGE_ARMS=(${PACMAN_PACKAGES_ARM[*]} filesystem)
3838

‎scripts/ci/linuxarmv7l/arch-bootstrap_downloadonly.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ trap 'error ${LINENO}' ERR
3535

3636
# Packages needed by pacman (see get-pacman-dependencies.sh)
3737
# PACMAN_PACKAGES=(
38-
# acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp boost cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv glib2 pcre libsystemd filesystem libcap libffi libx11 xorg-server libsm libice libxinerama libxrandr libxext randrproto libxi inputproto glfw-x11 xineramaproto uriparser curl libxml2 pugixml orc libpsl icu
38+
# acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive libassuan libgpg-error libssh2 lzo openssl pacman pacman-mirrorlist xz zlib linux-raspberrypi linux-raspberrypi-headers libutil-linux linux-api-headers linux-firmware krb5 e2fsprogs keyutils libidn gcc-libs gcc glibc coreutils systemd make pkg-config openal glew freeimage freetype2 libsndfile openssl mesa fontconfig gstreamer gst-plugins-base gst-plugins-base-libs gst-plugins-good gst-plugins-bad gst-libav assimp cairo pixman libpng harfbuzz graphite libdrm libx11 xproto kbproto libxcb libxau libxdmcp libxext xextproto libxdamage damageproto libxfixes fixesproto libxxf86vm xf86vidmodeproto libxrender renderproto alsa-lib flex libxrandr libxi libxcursor libxshmfence wayland opencv glib2 pcre libsystemd filesystem libcap libffi libx11 xorg-server libsm libice libxinerama libxrandr libxext randrproto libxi inputproto glfw-x11 xineramaproto uriparser curl libxml2 pugixml orc libpsl icu
3939
# )
4040
PACMAN_PACKAGES=(
41-
make pkg-config gcc raspberrypi-firmware linux-raspberrypi linux-raspberrypi-headers linux-firmware krb5 openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good assimp boost libxcursor opencv assimp glfw-x11 uriparser curl pugixml
41+
make pkg-config gcc raspberrypi-firmware linux-raspberrypi linux-raspberrypi-headers linux-firmware krb5 openal glew freeglut freeimage freetype2 cairo poco gstreamer gst-plugins-base gst-plugins-good assimp libxcursor opencv assimp glfw-x11 uriparser curl pugixml
4242
)
4343
BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} )
4444
EXTRA_PACKAGES=()

‎scripts/ci/linuxarmv7l/install.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ createArchImg(){
114114
gst-plugins-base \
115115
gst-plugins-good \
116116
assimp \
117-
boost \
118117
libxcursor \
119118
opencv \
120119
assimp \

‎scripts/ci/linuxrpi/multistrap.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ debootstrap=OpenFrameworks
1111
packages=libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev
1212

1313
# g++ base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc
14-
# libboost-filesystem-dev
1514
# libraspberrypi-dev raspberrypi-kernel-headers
1615
# libblas3 liblapack3
1716
# libopenblas-dev liblapack-dev

‎scripts/dev/download_libs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ cd download
338338
download "${PKGS[@]}"
339339

340340
cd ../ # back to libs
341-
libs=("boost" "cairo" "curl" "FreeImage" "brotli" "fmod" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "fmt")
341+
libs=("cairo" "curl" "FreeImage" "brotli" "fmod" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "fmt")
342342
if [ $OVERWRITE -eq 1 ]; then
343343
echo " "
344344
echo " Overwrite - Removing prior libraries for [$PLATFORM]"

‎scripts/dev/local_libs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ cd libs
216216

217217
if [ $OVERWRITE -eq 1 ]; then
218218
echo "Removing old libraries"
219-
libs=("boost" "cairo" "curl" "FreeImage" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "README.md")
219+
libs=("cairo" "curl" "FreeImage" "freetype" "glew" "glfw" "json" "libpng" "openssl" "pixman" "poco" "rtAudio" "tess2" "uriparser" "utf8" "videoInput" "zlib" "opencv" "ippicv" "assimp" "libxml2" "svgtiny" "README.md")
220220
for lib in $libs; do
221221
if [ -e $lib ]; then
222222
rm -rf $lib

0 commit comments

Comments
 (0)