rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flatpak build

Browse Source 
Don't assume libclang is going to be in the same prefix as firefox - in
flatpak builds, libclang is in /usr and firefox is in /app.

As a fix, use 'llvm-config --libdir' to find out the actual libclang
path during the build.
This commit is contained in:
Kalev Lember 2023-10-05 18:43:55 +02:00
parent a5727f9054
commit 66f31e3216
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -169,7 +169,7 @@ ExcludeArch: i686
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 118.0.1 Version: 118.0.1
Release: 4%{?pre_tag}%{?dist} Release: 5%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -661,7 +661,7 @@ echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key
# https://bugzilla.redhat.com/show_bug.cgi?id=2239046 # https://bugzilla.redhat.com/show_bug.cgi?id=2239046
# with clang 17 upstream's detection fails, so let's just tell it # with clang 17 upstream's detection fails, so let's just tell it
# where to look # where to look
echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
@ -1119,6 +1119,9 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Oct 05 2023 Kalev Lember <klember@redhat.com> - 118.0.1-5
- Fix flatpak build
* Mon Oct 2 2023 Martin Stransky <stransky@redhat.com>- 118.0.1-4 * Mon Oct 2 2023 Martin Stransky <stransky@redhat.com>- 118.0.1-4
- Updated man page - Updated man page