rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix flatpak builds

Browse Source 
Packages to be installed into flatpaks are built with the /app prefix
but build-only dependencies use the system packages in /usr.  Since ghc
falls into the latter category, installation path macros must not be
used to reference their installed location.
This commit is contained in:
Yaakov Selkowitz 2023-10-30 19:02:40 -04:00
parent 0a2fb947eb
commit cb06e9e98f
2 changed files with 7 additions and 4 deletions

5
ghc-rpm-macros.spec
View File

@ -8,7 +8,7 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.6.1 Version: 2.6.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -185,6 +185,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
%changelog %changelog
* Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.1-2
- Fix flatpak builds
* Tue Oct 24 2023 Jens Petersen <petersen@redhat.com> - 2.6.1-1 * Tue Oct 24 2023 Jens Petersen <petersen@redhat.com> - 2.6.1-1
- ghc_gen_filelists: tweak pkgdir for ghc-9.8 short hash suffices - ghc_gen_filelists: tweak pkgdir for ghc-9.8 short hash suffices

6
macros.ghc
View File

@ -95,13 +95,13 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\
%cabal_configure\ %cabal_configure\
%ghc_set_gcc_flags\ %ghc_set_gcc_flags\
if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\
cp %{_datadir}/ghc-rpm-macros/Setup.hs .\ cp /usr/share/ghc-rpm-macros/Setup.hs .\
fi\ fi\
if [ -d "%{ghclibdir}/lib" ]; then\ if [ -d "%{ghclibdir}/lib" ]; then\
subsubdir=/lib\ subsubdir=/lib\
fi\ fi\
%cabal --version\ %cabal --version\
%cabal configure %{!-W:%{?ghc_name:--with-compiler=%{_bindir}/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?cabal_configure_options} $cabal_configure_extra_options %cabal configure %{!-W:%{?ghc_name:--with-compiler=/usr/bin/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?flatpak:--extra-lib-dirs=%{_libdir}} %{?cabal_configure_options} $cabal_configure_extra_options
# install # install
%cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options} %cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options}
@ -302,7 +302,7 @@ done\
done\ done\
%endif %endif
%ghc_pkg_recache %{_bindir}/ghc-pkg-%{ghc_version} recache --no-user-package-db || : %ghc_pkg_recache /usr/bin/ghc-pkg-%{ghc_version} recache --no-user-package-db || :
# skip prof libs and documentation # skip prof libs and documentation
%ghc_quick_build\ %ghc_quick_build\