Skip to content

linux fix missing libcurl #8027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/actions/build-linux64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:

jobs:
build-linux64-platforms:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
strategy:
matrix:
cfg:
Expand All @@ -34,11 +34,11 @@ jobs:
run: if [ "$TARGET" = "linux64" ]; then
sudo apt-get remove libunwind-14 -y;
fi
- name: Cache Packages
uses: awalsh128/cache-apt-pkgs-action@latest
with:
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
version: 1.0
# - name: Cache Packages
# uses: awalsh128/cache-apt-pkgs-action@latest
# with:
# 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
# version: 1.0

- uses: actions/checkout@v4
- name: ccache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,20 @@ PLATFORM_PKG_CONFIG_LIBRARIES += freetype2
PLATFORM_PKG_CONFIG_LIBRARIES += fontconfig
PLATFORM_PKG_CONFIG_LIBRARIES += sndfile
PLATFORM_PKG_CONFIG_LIBRARIES += openal
# PLATFORM_PKG_CONFIG_LIBRARIES += openssl
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl


ifeq "$(shell pkg-config --exists openssl && echo 1)" "1"
PLATFORM_PKG_CONFIG_LIBRARIES += openssl
endif


ifeq "$(shell pkg-config --exists libcurl && echo 1)" "1"
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl
endif

ifeq "$(shell pkg-config --exists libcurl4 && echo 1)" "1"
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl4
endif


ifeq ($(CROSS_COMPILING),1)
Expand Down
12 changes: 6 additions & 6 deletions scripts/linux/ubuntu/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ function installPackages {
if [ $? -eq 0 ]; then
echo "Already installed"
else
error="$(apt-get install -y --dry-run --no-upgrade ${pkg})"
error="$(apt-get install -y --dry-run ${pkg})"
exit_code=$?
echo "$error" | grep Remv > /dev/null
if [ $? -eq 0 ]; then
apt-get install ${FORCE_YES} --no-upgrade ${pkg}
apt-get install ${FORCE_YES} ${pkg}
exit_code=$?
if [ $exit_code != 0 ]; then
echo "error installing ${pkg}, there could be an error with your internet connection"
echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues"
exit $exit_code
fi
elif [ $exit_code -eq 0 ]; then
apt-get -y -qq install --no-upgrade ${pkg}
apt-get -y -qq install ${pkg}
exit_code=$?
if [ $exit_code != 0 ]; then
echo "error installing ${pkg}, there could be an error with your internet connection"
Expand Down Expand Up @@ -192,7 +192,7 @@ else
fi


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"
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"
# libgconf-2-4 libboost-filesystem${BOOST_VER}-dev

echo "installing OF dependencies"
Expand Down Expand Up @@ -220,8 +220,8 @@ PACKAGES+=" gstreamer1.0-libav"
fi


apt-get -y -qq install --no-upgrade ${PACKAGES}
# installPackages ${PACKAGES}
apt-get -y -qq install ${PACKAGES}
installPackages ${PACKAGES}

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