Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Do not use linux-latest runner, use an older stable version. #598

Merged
merged 9 commits into from Sep 29, 2021
Merged

Do not use linux-latest runner, use an older stable version. #598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
783c850
Do not use linux-latest runner, use an older stable version.
Sep 25, 2021
528ce27
Do not try to load libllvm12:i386 on ubuntu-18.04
marceltaeumel Sep 25, 2021
a9619d8
Merge remote-tracking branch 'upstream/Cog' into dtl/linux-runs-on-se…
marceltaeumel Sep 28, 2021
e0e2198
Merge remote-tracking branch 'upstream/Cog' into dtl/linux-runs-on-se…
marceltaeumel Sep 28, 2021
0cce8a8
Use architecture-specific pkg-config to also find the right include p…
marceltaeumel Sep 28, 2021
fae103c
Unload pre-loaded libfreetype6-dev (64-bit) (such as on Ubuntu 18.04)…
marceltaeumel Sep 28, 2021
8b2c633
Fix syntax error. Sorry for the noise.
marceltaeumel Sep 28, 2021
bac32e3
Set PKG_CONFIG with a full /usr/bin/ path to not be overwritten again.
marceltaeumel Sep 28, 2021
2c67883
Always use generic "pkg-config" except for 32-bit x86 builds. Note th…
marceltaeumel Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions platforms/unix/config/configure
View file
Open in desktop
Expand Up @@ -12115,10 +12115,10 @@ fi

########################

PKG_CONFIG=$host-pkg-config
PKG_CONFIG=/usr/bin/$host-pkg-config
if [ ! $(type -t $PKG_CONFIG) ]; then
# Workaround for Debian/Ubuntu
PKG_CONFIG=i686-linux-gnu-pkg-config
PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
fi

########################
Expand Down
4 changes: 2 additions & 2 deletions platforms/unix/config/configure.ac
View file
Open in desktop
Expand Up @@ -263,10 +263,10 @@ fi

########################

PKG_CONFIG=$host-pkg-config
PKG_CONFIG=/usr/bin/$host-pkg-config
if [[ ! $(type -t $PKG_CONFIG) ]]; then
# Workaround for Debian/Ubuntu
PKG_CONFIG=i686-linux-gnu-pkg-config
PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
fi

########################
Expand Down