Skip to content

Commit 63a3db6

Browse files
authored
linux fix missing libcurl (#8027)
* linux fix missing libcurl * libcurl4-openssl-dev * libcurl * Update build-linux64.yml * Update build-linux64.yml * curl * ssl3 / libcurl * package managers * allow upgrade * ssl
1 parent 18df276 commit 63a3db6

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

.github/workflows/actions/build-linux64.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222

2323
jobs:
2424
build-linux64-platforms:
25-
runs-on: ubuntu-24.04
25+
runs-on: ubuntu-latest
2626
strategy:
2727
matrix:
2828
cfg:
@@ -34,11 +34,11 @@ jobs:
3434
run: if [ "$TARGET" = "linux64" ]; then
3535
sudo apt-get remove libunwind-14 -y;
3636
fi
37-
- name: Cache Packages
38-
uses: awalsh128/cache-apt-pkgs-action@latest
39-
with:
40-
packages: wget2 make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-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
41-
version: 1.0
37+
# - name: Cache Packages
38+
# uses: awalsh128/cache-apt-pkgs-action@latest
39+
# with:
40+
# packages: wget2 make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-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
41+
# version: 1.0
4242

4343
- uses: actions/checkout@v4
4444
- name: ccache

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,20 @@ PLATFORM_PKG_CONFIG_LIBRARIES += freetype2
359359
PLATFORM_PKG_CONFIG_LIBRARIES += fontconfig
360360
PLATFORM_PKG_CONFIG_LIBRARIES += sndfile
361361
PLATFORM_PKG_CONFIG_LIBRARIES += openal
362-
# PLATFORM_PKG_CONFIG_LIBRARIES += openssl
363-
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl
362+
363+
364+
ifeq "$(shell pkg-config --exists openssl && echo 1)" "1"
365+
PLATFORM_PKG_CONFIG_LIBRARIES += openssl
366+
endif
367+
368+
369+
ifeq "$(shell pkg-config --exists libcurl && echo 1)" "1"
370+
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl
371+
endif
372+
373+
ifeq "$(shell pkg-config --exists libcurl4 && echo 1)" "1"
374+
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl4
375+
endif
364376

365377

366378
ifeq ($(CROSS_COMPILING),1)

scripts/linux/ubuntu/install_dependencies.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ function installPackages {
2828
if [ $? -eq 0 ]; then
2929
echo "Already installed"
3030
else
31-
error="$(apt-get install -y --dry-run --no-upgrade ${pkg})"
31+
error="$(apt-get install -y --dry-run ${pkg})"
3232
exit_code=$?
3333
echo "$error" | grep Remv > /dev/null
3434
if [ $? -eq 0 ]; then
35-
apt-get install ${FORCE_YES} --no-upgrade ${pkg}
35+
apt-get install ${FORCE_YES} ${pkg}
3636
exit_code=$?
3737
if [ $exit_code != 0 ]; then
3838
echo "error installing ${pkg}, there could be an error with your internet connection"
3939
echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues"
4040
exit $exit_code
4141
fi
4242
elif [ $exit_code -eq 0 ]; then
43-
apt-get -y -qq install --no-upgrade ${pkg}
43+
apt-get -y -qq install ${pkg}
4444
exit_code=$?
4545
if [ $exit_code != 0 ]; then
4646
echo "error installing ${pkg}, there could be an error with your internet connection"
@@ -192,7 +192,7 @@ else
192192
fi
193193

194194

195-
PACKAGES="make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev ${LIB_GTK_DEV} libopencv-dev libassimp-dev librtaudio-dev libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev"
195+
PACKAGES="make libssl3 libcurl4 libcurl4-openssl-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev ${LIB_GTK_DEV} libopencv-dev libassimp-dev librtaudio-dev libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev libpugixml-dev libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev"
196196
# libgconf-2-4 libboost-filesystem${BOOST_VER}-dev
197197

198198
echo "installing OF dependencies"
@@ -220,8 +220,8 @@ PACKAGES+=" gstreamer1.0-libav"
220220
fi
221221

222222

223-
apt-get -y -qq install --no-upgrade ${PACKAGES}
224-
# installPackages ${PACKAGES}
223+
apt-get -y -qq install ${PACKAGES}
224+
installPackages ${PACKAGES}
225225

226226
if [[ $MAJOR_VERSION -lt 18 ]]; then
227227
cp $ROOT/../extra/poco_config.mk $ROOT/../../../addons/ofxPoco/addon_config.mk

0 commit comments

Comments
 (0)