Skip to content
Snippets Groups Projects
Commit 30d10c7d authored by Sébastien Blin's avatar Sébastien Blin
Browse files

qt6: update 0001-fix-gcc13.patch

From qt6-webengine's RPM sources

Change-Id: Ic0a47429a184c1dc5340a5d9ab4d0c40361eac4b
parent 6ce57d6a
No related branches found
Tags beta/202402071743
No related merge requests found
......@@ -99,7 +99,8 @@ RUN dnf install -y \
clang \
cmake \
fmt-devel \
python3-html5lib
python3-html5lib \
cups-devel
ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
......
......@@ -83,7 +83,7 @@ sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/s
sed -i 's,#include <QtCore/qbytearray.h>,#include <QtCore/qbytearray.h>\n#include <limits>,g' qtbase/src/corelib/text/qbytearraymatcher.h
cat qtwebengine/configure.cmake
# recent gcc version do not like lto from qt
CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" ./configure \
CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \
-opensource \
-confirm-license \
-nomake examples \
......
......@@ -57,6 +57,9 @@ cd %{_builddir}/jami-%{version}/daemon/contrib/native && \
make fetch && \
make %{_smp_mflags} V=1 .ffmpeg
# Qt-related variables
export CXXFLAGS="${CXXFLAGS} -fno-lto"
export CFLAGS="${CFLAGS} -fno-lto"
export LDFLAGS="$(CFLAGS) ${LDFLAGS}"
cd %{_builddir}/jami-%{version} && \
mkdir build && cd build && \
cmake -DENABLE_LIBWRAP=true \
......@@ -66,10 +69,10 @@ cd %{_builddir}/jami-%{version} && \
-DWITH_DAEMON_SUBMODULE=true \
-DCMAKE_BUILD_TYPE=Release \
..
make -C %{_builddir}/jami-%{version}/build %{_smp_mflags} V=1
make -C %{_builddir}/jami-%{version}/build %{_smp_mflags} V=2
%install
DESTDIR=%{buildroot} make -C %{_builddir}/jami-%{version}/build install
DESTDIR=%{buildroot} make -C %{_builddir}/jami-%{version}/build install V=2
%files
%defattr(-,root,root,-)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment