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

add comments about flatpak hardcoding of paths

Browse Source
This commit is contained in:
Jens Petersen 2023-11-09 11:46:35 +08:00
parent cb06e9e98f
commit 6fc265fb5e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.spec
View File

@ -7,8 +7,8 @@
%endif %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.6.1 Version: 2.6.3
Release: 2%{?dist} Release: 1%{?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,7 +185,7 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
%changelog %changelog
* Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.1-2 * Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.3-1
- Fix flatpak builds - 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

3
macros.ghc
View File

@ -95,12 +95,14 @@ 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\
# datadir hardcoded for flatpaks
cp /usr/share/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\
# bindir hardcoded for flatpaks
%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 %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
@ -302,6 +304,7 @@ done\
done\ done\
%endif %endif
# bindir hardcoded for flatpaks
%ghc_pkg_recache /usr/bin/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