From 16df5d8f6d1eaabab921b935b9829993dce85808 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 9 Sep 2021 18:32:06 +0800 Subject: [PATCH] cabal_configure: add -fhide-source-paths to ghc-options --- ghc-rpm-macros.spec | 7 +++++-- macros.ghc | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 52d2814..9f678fd 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,8 +7,8 @@ %endif Name: ghc-rpm-macros -Version: 2.2.3 -Release: 6%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -184,6 +184,9 @@ EOF %changelog +* Thu Sep 9 2021 Jens Petersen - 2.2.4-1 +- cabal_configure: add -fhide-source-paths to ghc-options + * Mon Aug 23 2021 Jens Petersen - 2.2.3-6 - F35 obsoletes for attempt diff --git a/macros.ghc b/macros.ghc index 497168c..268b7c0 100644 --- a/macros.ghc +++ b/macros.ghc @@ -30,7 +30,7 @@ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ cp %{_datadir}/ghc-rpm-macros/Setup.hs .\ fi\ %cabal --version\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?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')}" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?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 # install %cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options}