enable shared libraries and dynamic linking on all archs; disable debuginfo
- ghc-7.8 support dynamic libs and linking on all arches now - ghc-7.10 will support dwarf debugging output
This commit is contained in:
parent
c62456812e
commit
a93d10698f
@ -6,7 +6,7 @@
|
|||||||
#%%global without_hscolour 1
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.3.10
|
Version: 1.4.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RPM macros for building packages for GHC
|
Summary: RPM macros for building packages for GHC
|
||||||
|
|
||||||
@ -72,16 +72,6 @@ install -p -D -m 0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_l
|
|||||||
install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
|
install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
|
||||||
install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
|
install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
|
||||||
|
|
||||||
# turn off shared libs and dynamic linking on secondary archs
|
|
||||||
%ifnarch %{ix86} x86_64
|
|
||||||
cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
|
|
||||||
|
|
||||||
# shared libraries are only supported on primary intel archs
|
|
||||||
%%ghc_without_dynamic 1
|
|
||||||
%%ghc_without_shared 1
|
|
||||||
EOF
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING AUTHORS
|
%doc COPYING AUTHORS
|
||||||
@ -98,6 +88,12 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 17 2015 Jens Petersen <petersen@redhat.com> - 1.4.0-1
|
||||||
|
- enable shared libraries and dynamic linking on all arch's
|
||||||
|
since ghc-7.8 now supports that
|
||||||
|
- disable debuginfo until ghc-7.10 which will support dwarf debugging output
|
||||||
|
(#1138982)
|
||||||
|
|
||||||
* Fri Nov 14 2014 Jens Petersen <petersen@redhat.com> - 1.3.10-1
|
* Fri Nov 14 2014 Jens Petersen <petersen@redhat.com> - 1.3.10-1
|
||||||
- split ghc.attr into ghc_lib.attr and ghc_bin.attr for finer grained handling
|
- split ghc.attr into ghc_lib.attr and ghc_bin.attr for finer grained handling
|
||||||
- require ghc-compiler for ghc_version
|
- require ghc-compiler for ghc_version
|
||||||
|
@ -82,11 +82,13 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
|
|||||||
|
|
||||||
# ghc_bin_build
|
# ghc_bin_build
|
||||||
%ghc_bin_build\
|
%ghc_bin_build\
|
||||||
|
%global debug_package %{nil}\
|
||||||
%cabal_configure\
|
%cabal_configure\
|
||||||
%cabal build
|
%cabal build
|
||||||
|
|
||||||
# ghc_lib_build_without_haddock [name] [version]
|
# ghc_lib_build_without_haddock [name] [version]
|
||||||
%ghc_lib_build_without_haddock()\
|
%ghc_lib_build_without_haddock()\
|
||||||
|
%global debug_package %{nil}\
|
||||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
|
||||||
%cabal build\
|
%cabal build\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
Loading…
Reference in New Issue
Block a user