forked from pool/ghc-rpm-macros
c43e4d32e9
- update to 1.4.93
- refreshed:
add-group.patch
files-defattr.patch
fix-gen-filelists.patch
fix-library-dir.patch
suse-disable-debug-packages.patch
suse-docdir.patch
- dropped:
version-docdirs.patch
fix-runpath.patch
ldflags.patch
- added:
remove-flags.patch
- fix ghc-pkg path in ghc-deps.sh for ghc-7.10
- local pkgdir macro is redundant
- use utf8 locale for cabal
- add explicit --enable-shared again for arm64
- introduce ghc_pkgdocdir since no _pkgdocdir in RHEL 7 and earlier
- allow overriding ghc- prefix with ghc_name (for ghc784 etc)
- version ghc-pkg in ghc_pkg_recache
- have to turn off hardening in cabal_configure: set _hardened_ldflags to nil
- add cabal_test macro
- only run cabal haddock for real libraries with modules
- make sure basepkg.files is also created for meta packages
- fix the R*PATH regexp
- version ghcpkgdocdir
- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir
- correct cabal-tweak-flag error message for missing flag
- update ghc_gen_filelists to use new keyed library filepaths
OBS-URL: https://build.opensuse.org/request/show/327589
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=49
14 lines
1009 B
Diff
14 lines
1009 B
Diff
Index: ghc-rpm-macros-1.4.93/macros.ghc
|
|
===================================================================
|
|
--- ghc-rpm-macros-1.4.93.orig/macros.ghc
|
|
+++ ghc-rpm-macros-1.4.93/macros.ghc
|
|
@@ -26,7 +26,7 @@ fi
|
|
%cabal_configure\
|
|
%ghc_check_bootstrap\
|
|
%global _hardened_ldflags %{nil}\
|
|
-%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
|
|
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgkey' --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
|