Skip to content

Commit 4b8c2ea

Browse files
jcfrusiems
authored andcommitted
ci: Fix generation of wrappers on rockylinux multi-lib distribution
This changes the QTDIR to /usr/include/qt5 and passes the correct include paths to the pythonqt_generator script, ensuring that necessary headers are found without extra symbolic links. Fixes #291
1 parent 9fff1f6 commit 4b8c2ea

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ jobs:
168168
169169
- name: Generate Wrappers
170170
run: |
171-
# workaround to allow to find the Qt include dirs for installed standard qt packages
172-
mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
173-
export QTDIR=/usr/include/qt5ln
171+
export QTDIR=/usr/include/qt5
174172
cd generator
175-
./pythonqt_generator
173+
# Specify "/usr/include" so that header "bits/wordsize.h" included from "qconfig.h" is found.
174+
# See https://git.rockylinux.org/staging/rpms/qt5-qtbase/-/blob/r8/SOURCES/qconfig-multilib.h
175+
./pythonqt_generator --include-paths=/usr/include
176176
177177
- name: Build PythonQt (exclude_generator)
178178
run: |
@@ -198,8 +198,7 @@ jobs:
198198
with:
199199
name: wrappers_${{ matrix.container_os }}-${{ matrix.container_os_version }}_${{ matrix.configuration }}
200200
path: generated_cpp
201-
# comment in after #291 is fixed
202-
# if-no-files-found: error
201+
if-no-files-found: error
203202

204203
macOS:
205204
strategy:

0 commit comments

Comments
 (0)