petersen pushed to ghc-rpm-macros (master). "add explicit --enable-shared again for arm64"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 2 03:54:06 UTC 2015


>From e5d78dcff47a2b6d441fbcb4b49f852a38e26c11 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Thu, 2 Apr 2015 12:52:27 +0900
Subject: add explicit --enable-shared again for arm64


diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 0899c05..2211ad7 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.4.13
+Version:        1.4.14
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -112,6 +112,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
 
 
 %changelog
+* Thu Apr  2 2015 Jens Petersen <petersen at redhat.com> - 1.4.14-1
+- add explicit --enable-shared again for arm64
+
 * Mon Mar 23 2015 Jens Petersen <petersen at redhat.com> - 1.4.13-1
 - fix ghc-deps.sh for ghc builds:
 - use .a files again instead of .conf for devel deps
diff --git a/macros.ghc b/macros.ghc
index 574af6f..ca027c2 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -109,7 +109,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
 %global debug_package %{nil}\
-%cabal_configure %{!?without_prof:-p} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
 %cabal build\
 %{nil}
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ghc-rpm-macros.git/commit/?h=master&id=e5d78dcff47a2b6d441fbcb4b49f852a38e26c11


More information about the scm-commits mailing list