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

add ghc_lib_build_without_haddock; no longer drop into subpackage dirs

Browse Source
This commit is contained in:
Jens Petersen 2012-06-05 11:40:54 +09:00
parent 89972ec757
commit 5abcaaca33
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghc-rpm-macros.ghc
View File

@ -252,16 +252,19 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%cabal_configure\ %cabal_configure\
%cabal build %cabal build
# ghc_lib_build [name] [version] # ghc_lib_build_without_haddock [name] [version]
%ghc_lib_build()\ %ghc_lib_build_without_haddock()\
%global debug_package %{nil}\ %global debug_package %{nil}\
%{?1:cd %1-%2}\
%cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\ %cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\
%cabal build\ %cabal build\
%{nil}
# ghc_lib_build [name] [version]
%ghc_lib_build()\
%ghc_lib_build_without_haddock()\
%if %{undefined without_haddock}\ %if %{undefined without_haddock}\
%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\ %cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\
%endif\ %endif\
%{?1:cd ..}\
%{nil} %{nil}
# install bin package # install bin package
@ -276,10 +279,8 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%global _use_internal_dependency_generator 0\ %global _use_internal_dependency_generator 0\
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\ %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\ %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
%{?1:cd %1-%2}\
%cabal_install\ %cabal_install\
%cabal_pkg_conf\ %cabal_pkg_conf\
%{?1:cd ..}\
%ghc_gen_filelists\ %ghc_gen_filelists\
%{!?1:%ghc_strip_dynlinked}\ %{!?1:%ghc_strip_dynlinked}\
%{nil} %{nil}

5
ghc-rpm-macros.spec
View File

@ -60,11 +60,14 @@ EOF
%changelog %changelog
* Fri May 25 2012 Jens Petersen <petersen@redhat.com> - 0.91-1 * Tue Jun 5 2012 Jens Petersen <petersen@redhat.com> - 0.91-1
- only build ghci .o library files on ghc_arches_with_ghci - only build ghci .o library files on ghc_arches_with_ghci
- support meta packages like haskell-platform without base lib files - support meta packages like haskell-platform without base lib files
- make it possible not to have to use common_summary and common_description - make it possible not to have to use common_summary and common_description
- rename ghc_binlib_package to ghc_lib_subpackage - rename ghc_binlib_package to ghc_lib_subpackage
- add ghc_lib_build_without_haddock
- no longer drop into package dirs when subpackaging with ghc_lib_build and
ghc_lib_install
* Mon Mar 19 2012 Jens Petersen <petersen@redhat.com> - 0.90-1 * Mon Mar 19 2012 Jens Petersen <petersen@redhat.com> - 0.90-1
- use new rpm metadata hash format for ghc-7.4 - use new rpm metadata hash format for ghc-7.4