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

revert setting without_shared and without_dynamic on secondary archs

Browse Source
This commit is contained in:
Jens Petersen 2011-02-11 01:50:04 +10:00
parent 30f51fc80d
commit 26005406d3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghc-rpm-macros.ghc
View File

@ -201,20 +201,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
# ghc_bin_build # ghc_bin_build
%ghc_bin_build\ %ghc_bin_build\
%ifnarch %{ix86} x86_64\
%global without_dynamic 1\
%global without_shared 1\
%endif\
%cabal_configure\ %cabal_configure\
%cabal build %cabal build
# ghc_lib_build [name] [version] # ghc_lib_build [name] [version]
%ghc_lib_build()\ %ghc_lib_build()\
%{?1:cd %1-%2}\ %{?1:cd %1-%2}\
%ifnarch %{ix86} x86_64\
%global without_dynamic 1\
%global without_shared 1\
%endif\
%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\
%{!?without_haddock:%cabal haddock %{!?without_hscolour:--hyperlink-source}}\ %{!?without_haddock:%cabal haddock %{!?without_hscolour:--hyperlink-source}}\

8
ghc-rpm-macros.spec
View File

@ -1,5 +1,5 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.11.8 Version: 0.11.9
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -47,11 +47,15 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
%changelog %changelog
* Fri Feb 11 2011 Jens Petersen <petersen@redhat.com> - 0.11.9-1
- revert "set without_shared and without_dynamic by default on secondary archs
in cabal_bin_build and cabal_lib_build" change, since happening for all archs
* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.8-1 * Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.8-1
- only link Setup dynamically if without_shared and without_dynamic not set - only link Setup dynamically if without_shared and without_dynamic not set
- add cabal_configure_options to pass extra options to cabal_configure
- set without_shared and without_dynamic by default on secondary archs - set without_shared and without_dynamic by default on secondary archs
in cabal_bin_build and cabal_lib_build in cabal_bin_build and cabal_lib_build
- add cabal_configure_options to pass extra options to cabal_configure
* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.7-1 * Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.7-1
- fix ghc-deps.sh for without_shared libraries - fix ghc-deps.sh for without_shared libraries