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

%ghc_bin_install and %ghc_lib_install now run ghc_fix_rpath on subpkgs

Browse Source
This commit is contained in:
Jens Petersen 2017-03-03 11:00:57 +09:00
parent b1fc196577
commit 2fb629fb9b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghc-rpm-macros.spec
View File

@ -150,6 +150,7 @@ EOF
* Thu Mar 2 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-1 * Thu Mar 2 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-1
- fix ghc_fix_rpath, ghc_gen_filelists, and ghc-deps.sh when pkg-ver already - fix ghc_fix_rpath, ghc_gen_filelists, and ghc-deps.sh when pkg-ver already
installed installed
- ghc_bin_install and ghc_lib_install now run ghc_fix_rpath on subpkgs
* Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.17-1 * Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.17-1
- setup --global/--user in cabal_configure - setup --global/--user in cabal_configure

2
macros.ghc
View File

@ -146,6 +146,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\ %{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\
%cabal_install\ %cabal_install\
%{!?1:%ghc_strip_dynlinked}\ %{!?1:%ghc_strip_dynlinked}\
%{?ghc_subpackaging:%ghc_fix_rpath %{subpkgs}}\
%{nil} %{nil}
# ghc_lib_install [name] [version] # ghc_lib_install [name] [version]
@ -157,6 +158,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%cabal_pkg_conf\ %cabal_pkg_conf\
%ghc_gen_filelists\ %ghc_gen_filelists\
%{!?1:%ghc_strip_dynlinked}\ %{!?1:%ghc_strip_dynlinked}\
%{?ghc_subpackaging:%ghc_fix_rpath %{subpkgs}}\
%{nil} %{nil}
# ghc_fix_rpath lib-ver ... # ghc_fix_rpath lib-ver ...