Skip to content

Commit d286556

Browse files
committed
Avoid spurious libgcc-s1 Debian package dependency
Do not add a strict dependency on gcc, which in a GitHub container isn't necessarily the same version as in a pristine Ubuntu system. Fixes: #5875
1 parent e317683 commit d286556

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/pull-request-checks.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ jobs:
407407
run: |
408408
cd build
409409
ninja package
410+
ls
410411
deb_package_name="$(ls *.deb)"
411412
echo "::set-output name=deb_package::./build/$deb_package_name"
412413
echo "::set-output name=deb_package_name::ubuntu-18.04-$deb_package_name"

cmake/packaging.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ set(CPACK_PACKAGE_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
2525
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
2626

2727
# In addition, we depend on gcc for preprocessing
28-
set(CPACK_DEBIAN_PACKAGE_DEPENDS gcc)
28+
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS gcc)
29+
set(CPACK_DEBIAN_PACKAGE_DEBUG YES)
2930

3031
# For windows we need to set up product and update GUID
3132
# See: https://docs.microsoft.com/en-us/windows/win32/msi/productcode

0 commit comments

Comments
 (0)