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

backport cabal_pkg_conf and fix ghc_strip_dynlinked

Browse Source 
- also backport cabal_pkg_conf for f13 compatibility
- fix ghc_strip_dynlinked when no dynlinked files
This commit is contained in:
Jens Petersen 2010-07-31 15:49:33 +10:00
parent 70e5acf6e4
commit 85ba4d157e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghc-rpm-macros.ghc
View File

@ -43,6 +43,12 @@ echo '%{ghcdocdir}' >> %1-doc.files \
%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
# create and install package scripts
%cabal_pkg_conf \
%ghc_gen_scripts\
%ghc_install_scripts\
%{nil}
# devel pkg basic requires
%ghc_requires Requires: ghc = %{ghc_version}\
Requires(post): ghc = %{ghc_version}\
@ -163,7 +169,7 @@ This package contains the profiling library.\
# ghc_strip_dynlinked
%ghc_strip_dynlinked\
%if 0%{!?__debug_package:1}\
find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print | xargs strip\
find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
%endif
# ghc_bin_build
@ -185,7 +191,6 @@ find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'
# ghc_lib_install
%ghc_lib_install\
%cabal_install\
%ghc_gen_scripts\
%ghc_install_scripts\
%cabal_pkg_conf\
%ghc_gen_filelists ghc-%{?pkg_name}%{!?pkg_name:%name}\
%ghc_strip_dynlinked

6
ghc-rpm-macros.spec
View File

@ -1,5 +1,5 @@
Name: ghc-rpm-macros
Version: 0.7.0.610.1
Version: 0.7.0.610.2
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Jul 31 2010 Jens Petersen <petersen@redhat.com> - 0.7.0.610.2-1
- also backport cabal_pkg_conf for f13 compatibility
- fix ghc_strip_dynlinked when no dynlinked files
* Sat Jul 31 2010 Jens Petersen <petersen@redhat.com> - 0.7.0.610.1-1
- backport 0.7.1 to ghc-6.10:
- add ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install,