Ondřej Súkup
a4e0d5b737
revert to old version, new has regression in generating requires for binnary OBS-URL: https://build.opensuse.org/request/show/344632 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=54
16 lines
1.1 KiB
Diff
16 lines
1.1 KiB
Diff
Index: ghc-rpm-macros-1.4.94/macros.ghc
|
|
===================================================================
|
|
--- ghc-rpm-macros-1.4.94.orig/macros.ghc
|
|
+++ ghc-rpm-macros-1.4.94/macros.ghc
|
|
@@ -26,9 +26,7 @@ fi
|
|
%cabal_configure\
|
|
%ghc_check_bootstrap\
|
|
%global _hardened_ldflags %{nil}\
|
|
-CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\
|
|
-LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
|
|
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options
|
|
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options
|
|
|
|
# install
|
|
%cabal_install %cabal copy --destdir=%{buildroot} -v
|