stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev

Browse Source 
Reviewed-by: andrew, erikj
This commit is contained in:
Aleksey Shipilev 2023-08-22 13:37:21 +00:00
parent f39fc0aa2d
commit 69d900d2ce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-cross-compile.yml vendored
View File

@ -137,7 +137,7 @@ jobs:
sudo debootstrap sudo debootstrap
--arch=${{ matrix.debian-arch }} --arch=${{ matrix.debian-arch }}
--verbose --verbose
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
--resolve-deps --resolve-deps
--variant=minbase --variant=minbase
$(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}") $(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}")

2
.github/workflows/main.yml vendored
View File

@ -148,7 +148,7 @@ jobs:
apt-architecture: 'i386' apt-architecture: 'i386'
# Some multilib libraries do not have proper inter-dependencies, so we have to # Some multilib libraries do not have proper inter-dependencies, so we have to
# install their dependencies manually. # install their dependencies manually.
apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386' apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
extra-conf-options: '--with-target-bits=32' extra-conf-options: '--with-target-bits=32'
configure-arguments: ${{ github.event.inputs.configure-arguments }} configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }}